Fixed merge conflicts

convexengineering · Apr 23, 2018 · 97dc66e · 97dc66e
1 parent 4e6a1bf
commit 97dc66e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gpkitmodels/GP/aircraft/motor/motor_test.py
@@ -36,16 +36,10 @@ def actuator_propulsor_test():
     test = Actuator_Propulsor_Test()
     test.solve()
 
-<<<<<<< HEAD
-
-
-=======
 def ME_propulsor_test():
     test = MultiElement_Propulsor_Test()
     sol = test.localsolve()
-    print sol.table()
->>>>>>> parent of 46e07bc... updates to tests
-
+
 def propulsor_test():
 
     test = Propulsor_Test()

diff --git a/gpkitmodels/GP/aircraft/prop/prop_test.py b/gpkitmodels/GP/aircraft/prop/prop_test.py
@@ -14,12 +14,7 @@ def simpleprop_test():
     m = Model(1/pp.eta  + p.W/(100.*units("lbf"))+ pp.Q/(100.*units("N*m")),
               [fs, p, pp])
     m.substitutions.update({"rho": 1.225, "V": 50, "T": 100, "omega":1000})
-<<<<<<< HEAD
     m.solve()
-
-=======
-    sol = m.solve()
-
 
 def ME_eta_test():
 
@@ -31,7 +26,6 @@ def ME_eta_test():
     pp.cost = 1./pp.eta + pp.Q/(100.*units("N*m")) + p.T_m/(1000*units('N'))
     sol = pp.localsolve(iteration_limit = 400)
     print sol.table()
->>>>>>> parent of 46e07bc... updates to tests
 
 
 def test():