fix: remove merge artifacts

ila · Oct 19, 2021 · a34cffb · a34cffb
1 parent 16ea791
commit a34cffb
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Fit for TUM.md b/Fit for TUM.md
@@ -92,7 +92,4 @@ Furthermore, there is a Double Degree program offering the opportunity to study
 ATHENS provides one week courses abroad in 24 universities in Europe.
 
 Studying abroad is supported by TUM with scholarships and grants from the Bavarian Ministry for Education. 
-<<<<<<< HEAD
 
-=======
->>>>>>> db3ec3541dfd196efde69b5d26eeb17acb44977a