From d06555ad16390972e27af605c5afd21209daf428 Mon Sep 17 00:00:00 2001
From: jvfpw18 <jvfpw18@inf.ufpr.br>
Date: Fri, 21 Aug 2020 11:59:55 -0300
Subject: [PATCH] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 82a5e73..4c5c211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,5 @@ pairing/
 .cache
 .coverage
 .vscode
-<<<<<<< HEAD
 data/
-=======
-.idea/
->>>>>>> two_way_derivatives
+.idea/
\ No newline at end of file
-- 
GitLab