From 2f4ddd69e596588aadfed1b3ffd76f9eff9106a2 Mon Sep 17 00:00:00 2001
From: jiang <gitea@fake.local>
Date: Tue, 14 Mar 2023 17:36:43 +0800
Subject: [PATCH] conflict fix

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

diff --git a/src/test.txt b/src/test.txt
index 237ccb92..784265fe 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-质量分析 用例相关接口（列表，上传，下载，删除）已完成，评审未完成
+conflict fix