Merge pull request #384 from Dazpoet/patch_ModuleFixer-2

ModuleFixer conflict updates
This commit is contained in:
Willhelm Rendahl 2015-04-25 13:36:54 +02:00
commit 79dfeefdac
1 changed files with 1 additions and 1 deletions

View File

@ -10,7 +10,7 @@
},
"conflicts" : [ { "name" : "Karbonite" },
{ "name" : "KarbonitePlus" },
{ "name" : "Regolith" },
{ "name" : "AlcubierreStandalone" },
{ "name" : "USI-ART" },
{ "name" : "USI-EXP" },
{ "name" : "USI-FTT" },