diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index c687666..7597ffd 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -180,7 +180,6 @@ export default {
   },
 };
 </script>
-<<<<<<< HEAD
 <style lang="less">
 .runStatusDialog {
   .pageNation {
@@ -195,6 +194,3 @@ export default {
   }
 }
 </style>
-=======
-<style lang="less" scoped></style>
->>>>>>> hn1.0