From 632333886a0c811ce9cdffe97507658888078b21 Mon Sep 17 00:00:00 2001
From: weishao <wanwei@educoder.com>
Date: Tue, 14 Mar 2023 17:50:40 +0800
Subject: [PATCH] Revert tmp

---
 src/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test.txt b/src/test.txt
index 784265fe..546fd27c 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-conflict fix
+Revert "tmp"