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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/test.js b/test.js
index 0cf663e..706df8b 100644
--- a/test.js
+++ b/test.js
@@ -1,3 +1,12 @@
 gittest.fsdf
 
-feature1
\ No newline at end of file
+feature1
+
+feature:rebase
+
+develop:123
+
+develop:234
+
+feature:merge
+

--
Gitblit v1.9.1