fixed .gitingore

phpbrew · Feb 23, 2014 · 31a7f7b · 31a7f7b
1 parent 215caef
commit 31a7f7b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 .onion
 vendor
-=======
-Gemfile.lock
-vendor/bundle
->>>>>>> b55183f... Added tf as test suite for bash sripts
+composer.lock