From cd8ec3c6637fb4c0835765b475d568165ddb0136 Mon Sep 17 00:00:00 2001
From: Chunxiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:01 +0800
Subject: [PATCH] merge liuzx_trainjob

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

diff --git a/src/test.txt b/src/test.txt
index 8c002603..8c4e6119 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-solve conflict
+merge liuzx_trainjob