From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 09 Mar 2022 14:22:09 +0800 Subject: [PATCH] conflect merge --- src/main/resources/application-loop.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main/resources/application-loop.yml b/src/main/resources/application-loop.yml index fdbb2a2..a77d03e 100644 --- a/src/main/resources/application-loop.yml +++ b/src/main/resources/application-loop.yml @@ -99,7 +99,7 @@ day-line: false other-job: true loop-job: true - rabbit-consumer: false + rabbit-consumer: true block-job: true aliyun: -- Gitblit v1.9.1