Commit c508526eeb43bb7072caa6ad39385c374ea718e7

Authored by Thomas Røiri Aaslund
1 parent b6f75356

fds dsf

Showing 1 changed file with 0 additions and 6 deletions   Show diff stats
@@ -9,11 +9,5 @@ public class TestVehicle @@ -9,11 +9,5 @@ public class TestVehicle
9 { 9 {
10 System.out.println("test123"); 10 System.out.println("test123");
11 System.out.println("test456"); 11 System.out.println("test456");
12 -<<<<<<< HEAD  
13 - System.out.println("test789");  
14 - System.out.println("testABC");  
15 -=======  
16 -  
17 ->>>>>>> part0  
18 } 12 }
19 } 13 }
20 \ No newline at end of file 14 \ No newline at end of file