From 5af8ecb6148170dfe21be58a6d7a33f57b8d7668 Mon Sep 17 00:00:00 2001
From: David Seus <david.seus@ians.uni-stuttgart.de>
Date: Fri, 30 Apr 2021 21:09:28 +0200
Subject: [PATCH] resolve conflicts

---
 .gitignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9235563..105d75f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,11 @@
 *.fls
 *.log
 *.out
+*.pdf
+*.kate-swp
 *.synctex.gz
 
-# template.tex output
-# move to *.pdf once manual is done
-template.pdf
-
 # release tarballs
 moderncv-*.tar.gz
+
+examples/