更新 test.java

src/solution/Solution.java

@@ -98,16 +98,6 @@ public class Solution {
         System.out.println(result);
     }
 
-<<<<<<< HEAD
-    public static int removeElement(int[] nums, int val) {
-        for (int i = 0; i < nums.length; i++) {
-            if (val == nums[i]){
-
-            }
-        }
-        return nums.length;
-    }
-=======
 //    public static String longestCommonPrefix(String[] strs) {
 //        int index = 0;
 //        StringBuilder temp = new StringBuilder();
@@ -158,6 +148,4 @@ public class Solution {
         }
         return strs[0];
     }
-
->>>>>>> a83429a6b794491f269fccaa74b710ca4abc514b
 }

src/solution/test.java

@@ -19,7 +19,6 @@ public class test {
 //        Solution.merge(nums1,m,nums2,n);
 //        String[] strs = new String[]{"flower","flow","flight"};
         String[] strs = new String[]{"flower","flower","flower","flower"};
-
         String result =  Solution.longestCommonPrefix(strs);
         System.out.println(result);
     }