From 2e4c9a25763b6439279cf693a3f7922d579c36b9 Mon Sep 17 00:00:00 2001
From: linliu <linliu@mail.tsinghua.edu.cn>
Date: Wed, 24 Aug 2022 23:23:37 +0800
Subject: [PATCH] develop

---
 111.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/111.txt b/111.txt
index e49f542..85221a5 100644
--- a/111.txt
+++ b/111.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 111
 
-Developing
-=======
-111
->>>>>>> ee00edbf5aacf24ba3e3c0b7dc2594c13921b994
+Develop
\ No newline at end of file