post-kerbin-mining-corporation / NearFuturePropulsion

Adds advanced electric propulsion systems to Kerbal Space Program
35 stars 30 forks source link

Conflict fixing #29

Closed lOmicronl closed 8 years ago

lOmicronl commented 8 years ago

Turns out, Github spazzing out over my fixing the indentation caused some unwanted chaos :S

About half the engines had a duplicated ModuleTestSubject, which this PR aims to remove. From the looks of it, there's no spazzing out this time, so let's hope it'll be a conflict-free pull...

ChrisAdderley commented 8 years ago

Looks good so far!