fixed Pipfile.lock

2024-05-27 17:15:55 +02:00
parent 1abb7e0aaa
commit 8255b3dea2
1 changed files with 0 additions and 8 deletions
@@ -247,19 +247,11 @@
        },
        "openpyxl": {
            "hashes": [
-<<<<<<< HEAD
                "sha256:24d7d361025d186ba91eff58135d50855cf035a84371b891e58fb6eb5125660f",
                "sha256:eccedbe1cdd8b2494057e73959b496821141038dbb7eb9266ea59e3f34208231"
            ],
            "index": "pypi",
            "version": "==3.1.0"
-=======
-                "sha256:a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184",
-                "sha256:f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5"
-            ],
-            "index": "pypi",
-            "version": "==3.1.2"
->>>>>>> main
        },
        "pint": {
            "hashes": [