From 8ec28c9b4906a29e9d1daea3e1c2e855b6ca7a01 Mon Sep 17 00:00:00 2001
From: zouap <zouap@pcl.ac.cn>
Date: Tue, 14 Mar 2023 17:52:04 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20pull=20request=20'=E5=9C=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BA=91=E8=84=91=E4=BB=BB=E5=8A=A1=E5=89=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0deleting=EF=BC=8Ckilling=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD'=20(#2818)=20from=20fix-2643=20into=20V20220?=
 =?UTF-8?q?830?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test.txt b/src/test.txt
index e0e9e6c4..d23b7cef 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-#1249 update point by resource management
+Merge pull request '在删除云脑任务前，增加deleting，killing状态判断' (#2818) from fix-2643 into V20220830