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

2025-12-29 00:27:43 +01:00
parent 4992c3e7b6 8879b273f5
commit ac04805906
2 changed files with 28 additions and 1 deletions
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -203,20 +203,47 @@
      "layout": {
        "style.css": {
          "type": "-",
+<<<<<<< HEAD
          "size": 22693,
          "lmtime": 1765311863239,
+=======
+          "size": 22678,
+<<<<<<< HEAD
+          "lmtime": 1764150215841,
+=======
+          "lmtime": 1764183540355,
+>>>>>>> adab4009ea3d5c884248109e64208485f9841267
+>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
          "modified": false
        },
        "style.css.map": {
          "type": "-",
+<<<<<<< HEAD
          "size": 40598,
          "lmtime": 1765311863239,
+=======
+          "size": 40575,
+<<<<<<< HEAD
+          "lmtime": 1764150215841,
+=======
+          "lmtime": 1764183540367,
+>>>>>>> adab4009ea3d5c884248109e64208485f9841267
+>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
          "modified": false
        },
        "style.scss": {
          "type": "-",
+<<<<<<< HEAD
          "size": 28215,
          "lmtime": 1765311862998,
+=======
+          "size": 28194,
+<<<<<<< HEAD
+          "lmtime": 1764150215424,
+=======
+          "lmtime": 1764183540380,
+>>>>>>> adab4009ea3d5c884248109e64208485f9841267
+>>>>>>> 8879b273f5ab44239eb02fd30e324c23f0b30ae8
          "modified": false
        }
      },