merge

2025-11-16 15:09:24 +01:00 · 2025-11-16 15:09:24 +01:00 · 671fbf6d5d
commit 671fbf6d5d
parent 70f91b63c6 c98cbc28dc
1 changed files with 10 additions and 0 deletions
--- a/project.json
+++ b/project.json
@ -2,12 +2,18 @@
    "name": "crafter-event",
    "configurations": [
        {
+<<<<<<< HEAD
            "name": "base",
+=======
+            "name": "lib",
+>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
            "interfaces": ["interfaces/Crafter.Event"],
            "type":"library"
+
        },
        {
            "name": "lib-debug",
+<<<<<<< HEAD
            "extends": ["base"],
            "debug":true,
            "dependencies": [
@ -26,6 +32,10 @@
                    "configuration":"lib"
                }
            ]
+=======
+            "debug" : true,
+            "extends": ["lib"]
+>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
        }
    ]
 }