Added chances

TimeIsMoney/src/de/Linus122/TimeIsMoney/Main.java

@@ -7,8 +7,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.PrintWriter;
-<<<<<<< HEAD
+import java.io.PrintWriter;
 import java.net.URL;
 import java.sql.Timestamp;
 import java.util.ArrayList;