diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java b/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java new file mode 100644 index 00000000..16ee1522 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java @@ -0,0 +1,7 @@ +package com.hmkcode.junit; + +public class Commint3 { + public static void main(String[] args) { + System.out.println("Commit 3"); + } +} diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java new file mode 100644 index 00000000..eecb833e --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java @@ -0,0 +1,5 @@ +package com.hmkcode.junit; + +public class Commit1 { + +} diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java new file mode 100644 index 00000000..9c3b4de6 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -0,0 +1,10 @@ +package com.hmkcode.junit; + +import java.util.function.Consumer; + +public class Commit2 { + public static void main(String[] args) { + System.out.println("Conflict check 2"); + System.out.println("Arjun changes: asdasdaslkdjal skdjalskdj asldjasdas"); + } +} \ No newline at end of file diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java new file mode 100644 index 00000000..f03c5996 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java @@ -0,0 +1,5 @@ +package com.hmkcode.junit; + +public class Commit5 { + +} diff --git a/simple-junit/target/classes/com/hmkcode/junit/Math.class b/simple-junit/target/classes/com/hmkcode/junit/Math.class index 7af1fc90..6198d41d 100644 Binary files a/simple-junit/target/classes/com/hmkcode/junit/Math.class and b/simple-junit/target/classes/com/hmkcode/junit/Math.class differ diff --git a/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class b/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class index 85c0ebbd..4fbe8d54 100644 Binary files a/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class and b/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class differ