merge

public/react/src/modules/paths/ShixunPathSearch.js

@@ -123,23 +123,6 @@ class ShixunPathSearch extends Component{
 					{this.state.updata===undefined?"":<UpgradeModals
 							{...this.state}
 						/>}
-<<<<<<< HEAD
-					{/*<style>*/}
-						{/*{*/}
-							{/*`*/}
-								{/*.pathImg{*/}
-									{/*width: 100%;*/}
-									{/*height: 300px;*/}
-									{/*background-image: url(${getImageUrl(`images/path/path.png`)});*/}
-									{/*background-color: #000a4f;*/}
-									{/*/* background-size: cover; */*/}
-									{/*background-position: center;*/}
-									{/*background-repeat: no-repeat;*/}
-								{/*}*/}
-							{/*`*/}
-						{/*}*/}
-					{/*</style>*/}
-=======
 
 					<style>
 						{
@@ -156,7 +139,6 @@ class ShixunPathSearch extends Component{
 							`
 						}
 					</style>
->>>>>>> develop
           <div className="pr">
             <div className="pathImg"></div>
             <div className="edu-back-white padding20 pathIndexNav">