fixed conflict

2025-12-05 22:28:40 -05:00
parent 6863b3618c dbcd06d192
commit fa710d35a1
3 changed files with 96 additions and 3 deletions
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
-</project>
+</project>