From 3263c35cd914f899009dfa8a18d737734dfbff02 Mon Sep 17 00:00:00 2001
From: David Seus <david.seus@ians.uni-stuttgart.de>
Date: Thu, 29 Apr 2021 19:59:13 +0200
Subject: [PATCH] resolve gitignore

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

diff --git a/.gitignore b/.gitignore
index 3c02433..e780389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,18 +6,11 @@
 *.fls
 *.log
 *.out
-<<<<<<< HEAD
 *.pdf
 *.kate-swp
 *.toc
-=======
 *.synctex.gz
 
-# template.tex output
-# move to *.pdf once manual is done
-template.pdf
->>>>>>> upstream/master
-
 # release tarballs
 moderncv-*.tar.gz
 *.gz