From 8c3e76a0f3ec3c75994562c28dd7eb5558a59129 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 07 Mar 2025 16:26:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/resource/waylineFile.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/views/resource/waylineFile.vue b/src/views/resource/waylineFile.vue
index 67e818e..03f65f6 100644
--- a/src/views/resource/waylineFile.vue
+++ b/src/views/resource/waylineFile.vue
@@ -227,7 +227,10 @@
},
},
};
+<<<<<<< HEAD
+=======
+>>>>>>> 448b6ce06438454ccbc00d953e36df9b8cc617ca
</script>
<style scoped>
--
Gitblit v1.9.3