update

2025-06-06 00:35:52 +02:00
parent 4c8a12aa0c
commit b5f9c95108
2 changed files with 0 additions and 9 deletions
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -2541,15 +2541,9 @@
          },
          "import-product.php": {
            "type": "-",
-<<<<<<< HEAD
            "size": 147,
            "lmtime": 1748902490178,
            "modified": true
-=======
-            "size": 151,
-            "lmtime": 1748942915279,
-            "modified": false
->>>>>>> 9fbe2fa613317433fc1d694bcd423e01558e1014
          },
          "index.php": {
            "type": "-",