FIX Merge code conflict

public/react/src/AppConfig.js

@@ -45,16 +45,10 @@ export function initAxiosInterceptors(props) {
     //      https://github.com/axios/axios/issues/1497
 
     // TODO 读取到package.json中的配置？
-<<<<<<< HEAD
-             var proxy = "http://123.59.135.93:56666"
-            //var proxy = "http://localhost:3000"
-			// proxy = "http://testbdweb.trustie.net"
-			// proxy = "http://testbdweb.educoder.net"
-=======
+
 			var //proxy = "http://localhost:3000"
 			 //proxy = "http://testbdweb.trustie.net"
 			 //proxy = "http://testbdweb.educoder.net"
->>>>>>> 07e257798976a985e99678db864e9ed96ad5dfdf
 			// proxy = "https://testeduplus2.educoder.net"
 			//proxy="http://47.96.87.25:48080"
 			// proxy="https://pre-newweb.educoder.net"