From ba78800e982eccddbee02e00e8b1c9a13eace4ba Mon Sep 17 00:00:00 2001
From: Your Name <21373439@buaa.edu.cn>
Date: Sun, 12 Mar 2023 20:46:37 +0800
Subject: [PATCH] try

---
 main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.py b/main.py
index 0b00c7a..f530ab8 100644
--- a/main.py
+++ b/main.py
@@ -1,4 +1,5 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371345.py')
 
 
@@ -6,3 +7,7 @@ os.system('python Function-21371345.py')
 ~
 
 
+=======
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+>>>>>>> dev