Merge pull request #710 from plague006/conflictresoluation
Resolve conflict between OPTSpacePlaneParts and Mk3MiniExpansionPack …
This commit is contained in:
commit
3e27b3a921
|
@ -17,6 +17,9 @@
|
|||
"install_to": "Ships"
|
||||
}
|
||||
],
|
||||
"conflicts": [
|
||||
{ "name": "OPTSpacePlaneParts" }
|
||||
],
|
||||
"resources": {
|
||||
"homepage": "http://forum.kerbalspaceprogram.com/threads/105063-0-90-Mk3-Mini-Expansion-Pack?p=1632752#post1632752",
|
||||
"kerbalstuff": "https://kerbalstuff.com/mod/449/Mk3%20Mini%20Expansion%20Pack"
|
||||
|
|
|
@ -16,6 +16,9 @@
|
|||
"name": "ModuleManager"
|
||||
}
|
||||
],
|
||||
"conflicts": [
|
||||
{ "name": "Mk3MiniExpansionPack" }
|
||||
],
|
||||
"resources": {
|
||||
"homepage": "http://forum.kerbalspaceprogram.com/threads/97525-0-90-WIP-DEV-OPT-V1-5-Mk3-Space-Shuttle-Expansions?p=1490754#post1490754",
|
||||
"kerbalstuff": "https://kerbalstuff.com/mod/340/OPT%20Space%20Plane%20Parts"
|
||||
|
|
Loading…
Reference in New Issue