From 40db1643fe644393ca04ccf74a20321bb2b6a21d Mon Sep 17 00:00:00 2001
From: Jonny <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:41:32 +0800
Subject: [PATCH] fix conflicts

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

diff --git a/src/test.txt b/src/test.txt
index 15561e7b..3cf068a0 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request 'fix issue 274 and 355' (#376) from cb2-without-dataset into V20210910
+fix conflicts