From f46cdb919bc12c48b13d3b4e595dc136ee987358 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 09 十月 2023 14:10:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- server/services/src/main/java/com/doumee/core/constants/Constants.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java index 70c4d79..12b9d0f 100644 --- a/server/services/src/main/java/com/doumee/core/constants/Constants.java +++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java @@ -18,7 +18,6 @@ public class Constants { -<<<<<<< HEAD public static final String DEFAULT_PWD = "DEFAULT_PWD"; public static final String TRUE = "t"; public static final String FALSE = "f"; -- Gitblit v1.9.3