chore: solve conflicts

revue-org · Jul 30, 2024 · 3aa427a · 3aa427a
1 parent b721f41
commit 3aa427a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/frontend/src/components/devices/DeviceBadge.vue b/frontend/src/components/devices/DeviceBadge.vue
@@ -190,7 +190,6 @@ ul {
     }
   }
 
-
   li {
     margin-bottom: 0.2rem;
 

diff --git a/frontend/src/components/security-rule/RuleBadge.vue b/frontend/src/components/security-rule/RuleBadge.vue
@@ -130,7 +130,6 @@ ul {
     }
   }
 
-
   li {
     margin-bottom: 0.2rem;
 

diff --git a/recognition/app/application/RecognitionEventsHub.py b/recognition/app/application/RecognitionEventsHub.py
@@ -10,4 +10,3 @@ def publish_detection(self, camera_code: str, object_class: str) -> None:
         :param camera_code: the camera code on which the object was detected
         :param object_class: the class of the detected object
         """
-        pass
diff --git a/recognition/app/application/RecognitionService.py b/recognition/app/application/RecognitionService.py
@@ -10,7 +10,6 @@ def start_recognizing(self, camera_code: str) -> None:
         If it is already recognizing the camera, it does nothing.
         :param camera_code: the camera code of the camera to start recognizing
         """
-        pass
 
     @abstractmethod
     def stop_recognizing(self, camera_code: str) -> None:
@@ -19,11 +18,9 @@ def stop_recognizing(self, camera_code: str) -> None:
         If it is not recognizing the camera, it does nothing.
         :param camera_code: the camera code of the camera to stop recognizing
         """
-        pass
 
     @abstractmethod
     def stop_all_recognizing(self):
         """
         It stops recognizing the video stream produced by all cameras.
         """
-        pass
diff --git a/recognition/app/infrastructure/main.py b/recognition/app/infrastructure/main.py
@@ -23,7 +23,7 @@
 def create_app():
     app = Flask(__name__)
     intrusion_rules.extend(get_intrusion_rules())
-    logger.info("Intrusion Rules: ", intrusion_rules)
+    logger.info("Intrusion Rules: " + str(intrusion_rules))
     enable_intrusion_rules()
 
     set_interval(check_rule_update, seconds=60)
-Original file line number
+Diff line change
@@ Expand Up / @@ -190,7 +190,6 @@ ul { @@
         }
       }
       li {
         margin-bottom: 0.2rem;
@@ Expand Down @@