From 499c26ca676a69b95ace27658c2d4e413e300a20 Mon Sep 17 00:00:00 2001
From: Begona Guereca <begonaguereca@github.com>
Date: Mon, 8 Aug 2022 10:28:10 -0700
Subject: [PATCH] Updated gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58996e1..45805d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-<<<<<<< HEAD
 .tmp
 
-=======
->>>>>>> main
 # User-specific files
 *.rsuser
 *.suo