b1900d: resolve merge conflict in Nasal/Electrical.nas and commit to FGAddon.
Authored by: lbrenta 2016-10-03
Parent: [r2238]
Child: [r2240]
