From 7ea2eaa57e1f967c628f39b8f12f3d583954e613 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:04 +0800
Subject: [PATCH] merge

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

diff --git a/src/test.txt b/src/test.txt
index 4ea5e4dd..a00af07a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-update
+merge