From 6a14c6e577797cb231dabd73cc559a014389fca2 Mon Sep 17 00:00:00 2001
From: shenjack <3695888@qq.com>
Date: Sun, 26 May 2024 01:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20deploy.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deploy.py b/deploy.py
index 9b0df3a..048183c 100644
--- a/deploy.py
+++ b/deploy.py
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-# 只是一个 dummy file
-=======
 import os
 import random
 
@@ -125,4 +122,3 @@ if __name__ == "__main__":
         except Exception as e:
             print(f"Error writing file: {e}")
             continue
->>>>>>> main