fixed motor docstring

convexengineering · Apr 20, 2018 · 9c4a2e6 · 9c4a2e6
1 parent fd8738e
commit 9c4a2e6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
@@ -41,11 +41,7 @@ class Motor(Model):
 
     Variables
     ---------
-<<<<<<< HEAD
     Qstar       .8          [kg/(N*m)]         motor specific torque
-=======
-    Qstar       .5          [kg/(N*m)]         motor specific torque
->>>>>>> master
     W                       [lbf]              motor weight
     Qmax                    [N*m]              motor max. torque
     V_max       300         [V]                motor max voltage