ignore merged

chester89 · chester89 · commit 8f182a3d8838 · 2013-04-23T00:33:51.000+04:00
diff --git a/.gitignore b/.gitignore
@@ -26,12 +26,11 @@ src/packages
 *.ncrunchproject
 *.swp
 TestResult.xml
-<<<<<<< HEAD
+
 src/packages/
 TestResult.xml
 build/
-=======
+
 *.ncrunchsolution
 *.ncrunchproject
 packages/
->>>>>>> master
