Add composer lock

Prometee · Feb 7, 2018 · 1169e18 · 1169e18
1 parent 73d4f75
commit 1169e18
Show file tree

Hide file tree

Showing 2 changed files with 9,908 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,12 +3,10 @@
 
 /vendor/
 /node_modules/
-/composer.lock
 
 /etc/build/*
 !/etc/build/.gitkeep
 
-<<<<<<< HEAD
 tests/Application/node_modules/
 
 tests/Application/var/
@@ -19,7 +17,5 @@ tests/Application/web/*
 !tests/Application/web/app.php
 !tests/Application/web/app_dev.php
 !tests/Application/web/app_test.php
-!tests/Application/web/assets/shop/css/bitbag.css
-=======
+
 /tests/Application/yarn.lock
->>>>>>> 6e78a83e890b4e43c796013cb0c3becb89138b6f