From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-omd/Dockerfile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/Dockerfile b/Source/UBCS/ubcs-service/ubcs-omd/Dockerfile
index 889d8d8..e261e6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/Dockerfile
+++ b/Source/UBCS/ubcs-service/ubcs-omd/Dockerfile
@@ -1,6 +1,6 @@
 FROM bladex/alpine-java:openjdk8-openj9_cn_slim
 
-MAINTAINER bladejava@qq.com
+MAINTAINER ubcsjava@qq.com
 
 RUN mkdir -p /ubcs/omd
 

--
Gitblit v1.10.0