Merge branch 'main' of https://git.buyusdt.xyz/bmy/xiezheng_h5

tt
2024-12-03 09:01:10 +08:00 · 2024-12-03 09:00:31 +08:00
2 changed files with 5 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,4 +23,4 @@ steps:
  commands:
    - echo "$SSH_IP git.buyusdt.xyz" >> /etc/hosts
    - git clone $SSH_CLONE_URL
-    - sshpass -p $SSH_PASSWORD scp -o StrictHostKeyChecking=no -r /drone/src/xiezheng_h5/* $SSH_USERNAME@$SSH_IP:$SSH_STATIC_PATH
+    - sshpass -p $SSH_PASSWORD scp -o StrictHostKeyChecking=no -r /drone/src/xiezheng_h5/* $SSH_USERNAME@$SSH_IP:$SSH_STATIC_PATH
--- a/page/index.html
+++ b/page/index.html
@@ -4,7 +4,11 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<<<<<<< HEAD
+    <title>2222首页</title>
+=======
    <title>55首页</title>
+>>>>>>> 7552ad195152575511f52b52e773c8ea4cf28df4
    <script src="../js/utils/rem.js"></script>
    <link rel="stylesheet" href="../css/tool/clear.css">
    <link rel="stylesheet" href="https://unpkg.com/swiper@8.4.7/swiper-bundle.min.css">
Author	SHA1	Message	Date
bmy	289e938006	Merge branch 'main' of https://git.buyusdt.xyz/bmy/xiezheng_h5 All checks were successful continuous-integration/drone/push Build is passing Details	2024-12-03 09:01:10 +08:00
bmy	c6b62785a7	tt	2024-12-03 09:00:31 +08:00