From 87b8e632cdb6288abedf65fe3043e4092eeb70cf Mon Sep 17 00:00:00 2001
From: Jonny <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:52 +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 387c75cd..a00af07a 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-front end
+merge