Cleaned up the .gitignore file.. it seemed to have merge markers in it.

Signed-off-by: James Gregory <[email protected]>
MGillson · Jul 14, 2009 · 22cc783 · 22cc783
1 parent a90ec86
commit 22cc783
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-<<<<<<< HEAD:.gitignore
+
 **/*.suo
 **/*.user
 **/*.sln*
@@ -7,15 +7,18 @@ obj
 _ReSharper*
 dist
 output
-=======
-obj
-bin
-_ReSharper.*
-*.csproj.user
+build
+
+*.csproj.user
+
 *.resharper.user
+
 *.resharper
+
 *.suo
+
 *.cache
+
 *~
+
 *.swp
->>>>>>> semantic-model:.gitignore