From 8f60d2a3e58c78304f3c111e867863b25c196fd1 Mon Sep 17 00:00:00 2001
From: StageGuard <1355416608@qq.com>
Date: Thu, 23 Sep 2021 19:38:51 +0800
Subject: [PATCH] conflict

---
 gitVersion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitVersion b/gitVersion
index 690f782..44e054c 100644
--- a/gitVersion
+++ b/gitVersion
@@ -1 +1 @@
-90b0962d941928eaf0f4668b2a18c0938569074a
\ No newline at end of file
+0d44ed5273b20e5c31063a42a777ddc338e77aaf
\ No newline at end of file