From 9c4a2e61a75f6113b5141094944a692f79cee86c Mon Sep 17 00:00:00 2001
From: Chris Courtin <courtin@MIT.EDU>
Date: Fri, 20 Apr 2018 13:40:45 -0400
Subject: [PATCH] fixed motor docstring

---
 gpkitmodels/GP/aircraft/motor/motor.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gpkitmodels/GP/aircraft/motor/motor.py
index e84ac382..3f27dbdc 100644
--- 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