perhaps somewhat successfull merge

rahuldave · Mar 10, 2011 · 2992def · 2992def
2 parents b633fcc + b17f338
commit 2992def
Show file tree

Hide file tree

Showing 3 changed files with 556 additions and 336 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
 *~
+
+# Protege can create these, so ignore em
+catalog-v001.xml
+