fix: merge conflict resolve

samrose · samrose · commit 0923ece32f49 · 2024-05-22T10:10:47.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ result*
 
 
 #IDE
-.vscode
+.idea/
+.vscode/

-Original file line number
+Diff line change
 #IDE
 -.vscode
 +.idea/
 +.vscode/