From 22cc783c7e2a20292096d7866e275a6bca107a68 Mon Sep 17 00:00:00 2001
From: Paul Batum <paul.batum@gmail.com>
Date: Tue, 14 Jul 2009 20:20:20 +0800
Subject: [PATCH] Cleaned up the .gitignore file.. it seemed to have merge
 markers in it.

Signed-off-by: James Gregory <james@jagregory.com>
---
 .gitignore | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0576bc620..5ca0e3668 100644
--- 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