From d5d9f1e5c7d61f12c904c99ff81bbc1ba665337d Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Mon, 22 Nov 2021 14:43:46 +0800
Subject: [PATCH] Merge branch 'feature' into develop

---
 test.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/test.js b/test.js
index 39ee7b1..706df8b 100644
--- a/test.js
+++ b/test.js
@@ -6,4 +6,7 @@
 
 develop:123
 
-develop:234
\ No newline at end of file
+develop:234
+
+feature:merge
+

--
Gitblit v1.9.1