From 665107e3cfa02a6040bae4b8ac67907b9618dd39 Mon Sep 17 00:00:00 2001
From: "youHong.ai" <774495953@qq.com>
Date: Thu, 24 Nov 2022 15:14:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/README.md b/README.md
index ad79a9b..c9c4e09 100644
--- a/README.md
+++ b/README.md
@@ -96,13 +96,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
-    <
-    <
-    <
-    <
-    <
-    <
-    < HEAD
     <bean id="propertyPlaceholderConfigurer"
           class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
         <property name="locations" value="classpath:application.properties"/>
@@ -113,18 +106,6 @@
         <property name="systemFilePath" value="${systemFilePath}"/>
         <property name="logPath" value="${logPath}"/>
     </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>
 ```