修复 deploy.py

2024-05-26 01:01:51 +08:00 · 2024-05-26 01:01:51 +08:00 · 6a14c6e577
commit 6a14c6e577
parent b65c506131
1 changed files with 0 additions and 4 deletions
--- 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