From a03cc9bdfdc0f8369802454c9e1013f7d56c1245 Mon Sep 17 00:00:00 2001
From: farid <macbookair@macbooks-MacBook-Air.local>
Date: Mon, 28 Mar 2022 08:49:58 +0430
Subject: [PATCH] fix: conflict in gitignore file

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10ffc2d..a5dbc7e 100644
--- 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 ###