BF: Basics of closed-loop control #1046

fhswf · Nov 16, 2024 · a6ab9bf · a6ab9bf
1 parent 8fd94b0
commit a6ab9bf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/mlpro/bf/control/basics.py b/src/mlpro/bf/control/basics.py
@@ -532,12 +532,8 @@ def __init__( self,
                           p_logging = p_logging )
 
         self.system : System = p_system
-<<<<<<< HEAD
-
-=======
         self._last_update : TStampType = None
         self._current_action : Action  = None
->>>>>>> origin/bf/oa/control
 
 
 ## -------------------------------------------------------------------------------------------------