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

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

diff --git a/.gitignore b/.gitignore
index 7bd36dd5..0587e56f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .DS_Store
 .DS_Store
 .DS_Store
+.DS_Store
-- 
2.18.1