ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

修改冲突

main
youHong.ai 2022-11-24 15:14:48 +08:00
parent 9ad082697a
commit 665107e3cf
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
README.md
View File

@ -96,13 +96,6 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans> <beans>
<
<
<
<
<
<
< HEAD
<bean id="propertyPlaceholderConfigurer" <bean id="propertyPlaceholderConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations" value="classpath:application.properties"/> <property name="locations" value="classpath:application.properties"/>
@ -113,18 +106,6 @@
<property name="systemFilePath" value="${systemFilePath}"/> <property name="systemFilePath" value="${systemFilePath}"/>
<property name="logPath" value="${logPath}"/> <property name="logPath" value="${logPath}"/>
</bean> </bean>
=======
<bean id="propertyPlaceholderConfigurer"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations" value="classpath:application.properties"/>
</bean>
<bean id="basetest" class="basetest.BaseTestConfig">
<property name="serverName" value="${serverName}"/>
<property name="rootPath" value="${rootPath}"/>
<property name="systemFilePath" value="${systemFilePath}"/>
<property name="logPath" value="${logPath}"/>
</bean>
>>>>>>> a01b7872c839238409568119a0d0980f3a799c4d
</beans> </beans>
``` ```