Clean up shit

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

 import java.util.ArrayList;
@@ -87,7 +86,4 @@ public class TLWTeamsUpdater {

        return updateSql;
    }
-=======
-package de.jeyp91.tippliga;public class TLWTeamsUpdater {
->>>>>>> origin/master
 }