From 134eb5656ad8f5f60129ee17710bcee850731d22 Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Tue, 23 Nov 2021 10:10:29 +0800
Subject: [PATCH] merge:fast-forward3

---
 test.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/test.js b/test.js
index 4c43c72..2f42651 100644
--- a/test.js
+++ b/test.js
@@ -1,5 +1,4 @@
 gittest.fsdf
 
 feature1
-
-feature:rebase
\ No newline at end of file
+123
\ No newline at end of file

--
Gitblit v1.9.1