From 9ea63b7effab8de2f0738feef704abb886060aa3 Mon Sep 17 00:00:00 2001
From: wangsiyuan <2392948297@qq.com>
Date: Wed, 6 Sep 2023 16:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Solution.java?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/solution/Solution.java | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/solution/Solution.java b/src/solution/Solution.java
index 5fc0272..49abce7 100644
--- a/src/solution/Solution.java
+++ b/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
 }