Merge pull request #384 from Dazpoet/patch_ModuleFixer-2
ModuleFixer conflict updates
This commit is contained in:
commit
79dfeefdac
|
@ -10,7 +10,7 @@
|
||||||
},
|
},
|
||||||
"conflicts" : [ { "name" : "Karbonite" },
|
"conflicts" : [ { "name" : "Karbonite" },
|
||||||
{ "name" : "KarbonitePlus" },
|
{ "name" : "KarbonitePlus" },
|
||||||
{ "name" : "Regolith" },
|
{ "name" : "AlcubierreStandalone" },
|
||||||
{ "name" : "USI-ART" },
|
{ "name" : "USI-ART" },
|
||||||
{ "name" : "USI-EXP" },
|
{ "name" : "USI-EXP" },
|
||||||
{ "name" : "USI-FTT" },
|
{ "name" : "USI-FTT" },
|
||||||
|
|
Loading…
Reference in New Issue