修改冲突问题

97771037 · 焦凯 · 561106d1 · 97771037
Commit 97771037 authored Mar 18, 2021 by 焦凯
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

spring.factories ...nd/inz.basis/src/main/resources/META-INF/spring.factories +0 -1

No files found.
--- a/backend/inz.basis/src/main/resources/META-INF/spring.factories
+++ b/backend/inz.basis/src/main/resources/META-INF/spring.factories
@@ -13,5 +13,4 @@ com.beecode.inz.basis.config.CommonConfig,\
 com.beecode.inz.basis.config.MessageI18NConfiguration,\
 com.beecode.inz.basis.config.OperationTeamConfig,\
 com.beecode.inz.basis.config.FunctionTreeConfiguration,\
-com.beecode.inz.basis.config.CustomerContextConfiguration,\
 com.beecode.inz.basis.config.ContextConfiguration