Commit b6f753568c0308009f852d262a11b3030b83247b

Authored by Thomas Røiri Aaslund
2 parents cec48aa7 e38a4be8

merge fix

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