Merge branch 'jenkins_with_weblogic' of ssh://192.168.240.178:18081/eapim/eapim-online into jenkins_with_weblogic
# Conflicts: # WebContent/WEB-INF/weblogic.xml
This commit is contained in:
@@ -18,4 +18,4 @@
|
||||
<resource-name>org/slf4j/impl/StaticLoggerBinder.class</resource-name>
|
||||
</prefer-application-resources>
|
||||
</container-descriptor>
|
||||
</weblogic-web-app>
|
||||
</weblogic-web-app>
|
||||
Reference in New Issue
Block a user