From 57c6cb1d42d2d861225375b35d3033205595e586 Mon Sep 17 00:00:00 2001
From: Artur Nowakowski <artnow@st.amu.edu.pl>
Date: Sun, 15 Dec 2019 21:21:04 +0100
Subject: [PATCH] gitignore

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

diff --git a/.gitignore b/.gitignore
index 67f1e08..188ec4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> dev
 ### Laravel ###
 vendor/
 node_modules/
@@ -27,3 +23,4 @@ Homestead.json
 .phpunit.result.cache
 .idea
 .nuxt
+.DS_Store