merge gemacht

This commit is contained in:
dh
2024-12-17 15:02:48 +01:00
parent db45907791
commit e764d4adb6
+1 -5
View File
@@ -6,11 +6,7 @@
"compatibility": { "compatibility": {
"version": "7.1" "version": "7.1"
}, },
<<<<<<< HEAD "version": "0.190",
"version": "0.173",
=======
"version": "0.189",
>>>>>>> 04d67d2e0d688a8c20edd9a347dad2b09ea62229
"build": 0, "build": 0,
"date": 0 "date": 0
} }