From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/intellectInspect/inspectBigScreen/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/intellectInspect/inspectBigScreen/index.vue b/src/views/intellectInspect/inspectBigScreen/index.vue
index 53838fc..6d33be2 100644
--- a/src/views/intellectInspect/inspectBigScreen/index.vue
+++ b/src/views/intellectInspect/inspectBigScreen/index.vue
@@ -259,7 +259,7 @@
};
</script>
-<!-- Add "scoped" attribute to limit CSS to this component only -->
+<!-- Add "scoped" attribute to limit CSS to this components only -->
<style scoped lang="scss">
@keyframes warn {
0% {
--
Gitblit v1.9.2