Update

2 years ago · a58b25c3b3
1 changed files with 2 additions and 9 deletions
--- a/ArrayManipulation.java
+++ b/ArrayManipulation.java
@ -1,9 +1,6 @@
-<<<<<<< HEAD
 //coding Team 53 :)
-=======
-//Coding Team 53 :)

->>>>>>> df0ffdce1b2badd549db1092b03b5544360ca4d7
+
 import java.util.Arrays;

 public class ArrayManipulation {
@ -58,8 +55,4 @@ public class ArrayManipulation {
 		
        
    }
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> df0ffdce1b2badd549db1092b03b5544360ca4d7
+}