From 37b2fa02d4e9540b67f9ec02740d7720ec38df3a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:08:52 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/resources/config/lhx/application.properties |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index 3aead90..d62378d 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -41,7 +41,6 @@
 rabbitmq.port=5672
 rabbitmq.username=ct_rabbit
 rabbitmq.password=123456
-useRabbit=false
 
 server.session.timeout=120
 

--
Gitblit v1.9.1