Resolve git conflicts

BitBagCommerce · Oct 22, 2018 · fabe99f · fabe99f
1 parent 0334e5e
commit fabe99f
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,8 @@
-<<<<<<< HEAD
-/bin/*
-!/bin/.gitkeep
-
-=======
->>>>>>> c08494520e1bd10bdf10b8bddc8029d4f7d63938
 /vendor/
 /node_modules/
 /composer.lock
 
 /etc/build/*
-<<<<<<< HEAD
-!/etc/build/.gitkeep
-=======
 !/etc/build/.gitignore
->>>>>>> c08494520e1bd10bdf10b8bddc8029d4f7d63938
 
 /tests/Application/yarn.lock