.gitignore

@@ -56,5 +56,4 @@ hs_err_pid*
 replay_pid*
 
 >>>>>>> gitea/master
-.idea/*
-.idea/workspace.xml
+.idea/*

.idea/workspace.xml

@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="45f625e1-36c7-4942-8f7c-ba3ebe9a7d53" name="变更" comment="" />
+    <list default="true" id="45f625e1-36c7-4942-8f7c-ba3ebe9a7d53" name="变更" comment="">
+      <change beforePath="$PROJECT_DIR$/src/solution/Solution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/solution/Solution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/solution/test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/solution/test.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -74,7 +77,7 @@
       <option name="presentableId" value="Default" />
       <updated>1693822719192</updated>
       <workItem from="1693822720224" duration="5742000" />
-      <workItem from="1693895305007" duration="5358000" />
+      <workItem from="1693895305007" duration="5324000" />
     </task>
     <servers />
   </component>

src/solution/Solution.java

@@ -81,8 +81,4 @@ public class Solution {
         }
         return candidate;
     }
-
-    public void merge(int[] nums1, int m, int[] nums2, int n) {
-
-    }
 }

src/solution/test.java

@@ -6,6 +6,6 @@ import java.util.Set;
 
 public class test {
     public static void main(String[] args) {
-
+        
     }
 }