attempt to get merge working

hardtke · hardtke · commit ad5fd386322e · 2010-05-17T10:43:08.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,7 @@ bin/*
 dist/*
 docs/*
 *~
+run
 semantic.cache
 build.properties
-<<<<<<< master:.gitignore
-=======
-views/splittext.json
-.classpath
->>>>>>> local:.gitignore
+
