From 125bb95636157d0d4411b574cdff1c506543a146 Mon Sep 17 00:00:00 2001 From: Jorijn van der Graaf Date: Sun, 16 Nov 2025 15:10:05 +0100 Subject: [PATCH] merge 2 --- project.json | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/project.json b/project.json index 799a49d..4ec6162 100644 --- a/project.json +++ b/project.json @@ -2,40 +2,15 @@ "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": [ - { - "path":"https://forgejo.catcrafts.net/Catcrafts/Crafter.Thread.git", - "configuration":"lib-debug" - } - ] - }, - { - "name": "lib", - "extends": ["base"], - "dependencies": [ - { - "path":"https://forgejo.catcrafts.net/Catcrafts/Crafter.Thread.git", - "configuration":"lib" - } - ] -======= "debug" : true, "extends": ["lib"] ->>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7 } ] }