Compare commits

..

No commits in common. "671fbf6d5df78bbc18856eb809e0bdbacb58b206" and "c98cbc28dcbe85be0d1ebb1cf764dbe7a008d6f7" have entirely different histories.

View file

@ -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
}
]
}