fix: conflict in gitignore file

3 years ago · a03cc9bdfd
parent e502435524
commit a03cc9bdfd
1 changed files with 0 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,10 +2,6 @@
 /development/

 # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,laravel,vuejs,phpstorm
-<<<<<<< Updated upstream
-=======
-composer-prod.json
->>>>>>> Stashed changes
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,laravel,vuejs,phpstorm

 ### Laravel ###