Update to master

waterloo-rocketry · Jan 14, 2021 · bdb5a96 · bdb5a96
1 parent 1fdfff4
commit bdb5a96
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/topside/procedures/procedure.py b/topside/procedures/procedure.py
@@ -10,14 +10,8 @@ class ExportFormat(enum.Enum):
 
 # TODO(jacob): Investigate whether this would be better as a variant
 # rather than a base class.
-<< << << < HEAD
-
 
 @dataclass
-== == == =
->>>>>> > 137ddb6(Update procedure.py)
-
-
 class Action:
     pass
 

diff --git a/topside/procedures/tests/test_procedures_engine.py b/topside/procedures/tests/test_procedures_engine.py
@@ -354,7 +354,6 @@ def test_step_updates_conditions():
 
     proc_eng.step_time(1e6)
 
-<<<<<<< HEAD
     assert proc_eng.ready_to_proceed() is True
 
 
@@ -377,11 +376,3 @@ def test_reset():
     assert proc_eng.current_procedure_id == 'p1'
     assert proc_eng.current_step.step_id == 's1'
     assert plumb_eng.current_state('c1') == 'open'
-=======
-    assert proc_eng.ready_to_advance() is True
-
-<<<<<<< HEAD
->>>>>>> 5dc2bbe (Add string representation)
-=======
-single_procedure_suite()
->>>>>>> 4d99dea (Add string representation)