From df42fa7e97c4a93caa17b2aed5aecdc768d8bbd7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 15 Apr 2025 21:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/resource/waylineFile.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/views/resource/waylineFile.vue b/src/views/resource/waylineFile.vue
index 03f65f6..aef1be5 100644
--- a/src/views/resource/waylineFile.vue
+++ b/src/views/resource/waylineFile.vue
@@ -227,10 +227,6 @@
},
},
};
-<<<<<<< HEAD
-
-=======
->>>>>>> 448b6ce06438454ccbc00d953e36df9b8cc617ca
</script>
<style scoped>
--
Gitblit v1.9.3