fix gitignore

Aaron · Aaron · commit b988c9bee36c · 2020-06-23T12:14:02.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -22,11 +22,8 @@
 #/laravel/yarn-error.log
 
 
-<<<<<<< HEAD
+
 #/coreui/.DS_Store
-=======
-##/coreui/.DS_Store
->>>>>>> be2db42... first fix
 #/coreui/node_modules
 #/coreui/dist
 #/coreui/coverage
