From e532fb77946bf251cb3d5047df02d50a9c0c5cce Mon Sep 17 00:00:00 2001
From: Poli97 <paolo.pecis@studenti.unimi.it>
Date: Tue, 21 Apr 2020 15:49:17 +0200
Subject: [PATCH] Solved merge problems

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 65d29924..7bd36dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .DS_Store
 .DS_Store
+.DS_Store
+.DS_Store
-- 
2.18.1