Clean up shit

2020-10-04 12:23:43 +02:00
parent e57f79c18b
commit 557cd59c8f
14 changed files with 300 additions and 68 deletions
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package de.jeyp91.tippliga;

 import com.google.common.io.Resources;
@@ -59,7 +58,4 @@ public class TLWMatchesManagerBase {
        }
        return matchDateTime;
    }
-=======
-package de.jeyp91.tippliga;public class TLWMatchesManagerBase {
->>>>>>> origin/master
 }