Clean up shit

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

 import org.junit.Test;
@@ -12,7 +11,4 @@ public class TLWMatchesUpdaterFootballTest {

        System.out.println(sql);
    }
-=======
-package de.jeyp91.tippliga;public class TLWMatchesUpdaterFootball {
->>>>>>> origin/master
 }