Merged changes from pyfa-org/master into branch

Merged changes to see if we can clear up the merge conflict warning
2016-06-15 18:24:40 -07:00
parent b4694dcf03
commit 03d1d8f5a4
5 changed files with 79 additions and 43 deletions
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -629,7 +629,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):

    @property
    def rawCycleTime(self):
-        speed =  self.getModifiedItemAttr("speed") or self.getModifiedItemAttr("duration")
+        speed = self.getModifiedItemAttr("speed") or self.getModifiedItemAttr("duration")
        return speed

    @property