merge 2
This commit is contained in:
parent
671fbf6d5d
commit
125bb95636
1 changed files with 0 additions and 25 deletions
25
project.json
25
project.json
|
|
@ -2,40 +2,15 @@
|
||||||
"name": "crafter-event",
|
"name": "crafter-event",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"name": "base",
|
|
||||||
=======
|
|
||||||
"name": "lib",
|
"name": "lib",
|
||||||
>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
|
|
||||||
"interfaces": ["interfaces/Crafter.Event"],
|
"interfaces": ["interfaces/Crafter.Event"],
|
||||||
"type":"library"
|
"type":"library"
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "lib-debug",
|
"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,
|
"debug" : true,
|
||||||
"extends": ["lib"]
|
"extends": ["lib"]
|
||||||
>>>>>>> c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue