Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/drmaterac.pl

.vscode/ftp-kr.sync.cache.json

@@ -943,8 +943,8 @@
             },
             "defines.inc.php": {
               "type": "-",
-              "size": 8107,
-              "lmtime": 1744213952832,
+              "size": 8349,
+              "lmtime": 1748937559417,
               "modified": false
             },
             "defines_uri.inc.php": {
@@ -2541,9 +2541,15 @@
           },
           "import-product.php": {
             "type": "-",
+<<<<<<< HEAD
             "size": 147,
             "lmtime": 1748902490178,
             "modified": true
+=======
+            "size": 151,
+            "lmtime": 1748942915279,
+            "modified": false
+>>>>>>> 9fbe2fa613317433fc1d694bcd423e01558e1014
           },
           "index.php": {
             "type": "-",