Fix:fix conflict

examples/dubbo/go-server/profiles/dev/server.yml

@@ -41,21 +41,12 @@ services:
         loadbalance: "random"
 
 protocols:
-<<<<<<< HEAD
--   name: "dubbo"
-#    ip : "127.0.0.1"
-    port : 20000
-#-   name: "jsonrpc"
-#    ip: "127.0.0.1"
-#    port: 20001
-=======
   -   name: "dubbo"
-      ip : "127.0.0.1"
+  #    ip : "127.0.0.1"
       port : 20000
   #-   name: "jsonrpc"
   #    ip: "127.0.0.1"
   #    port: 20001
->>>>>>> upstream/master
 
 protocol_conf:
   dubbo:

examples/dubbo/go-server/profiles/release/server.yml

@@ -41,21 +41,12 @@ services:
       loadbalance: "random"
 
 protocols:
-<<<<<<< HEAD
--   name: "dubbo"
-#    ip : "127.0.0.1"
-    port : 20000
-#-   name: "jsonrpc"
-#    ip: "127.0.0.1"
-#    port: 20001
-=======
   -   name: "dubbo"
-      ip : "127.0.0.1"
+  #    ip : "127.0.0.1"
       port : 20000
   #-   name: "jsonrpc"
   #    ip: "127.0.0.1"
   #    port: 20001
->>>>>>> upstream/master
 
 protocol_conf:
   dubbo:

examples/dubbo/go-server/profiles/test/server.yml

@@ -41,21 +41,12 @@ services:
       loadbalance: "random"
 
 protocols:
-<<<<<<< HEAD
--   name: "dubbo"
-#    ip : "127.0.0.1"
-    port : 20000
-#-   name: "jsonrpc"
-#    ip: "127.0.0.1"
-#    port: 20001
-=======
   -   name: "dubbo"
-      ip : "127.0.0.1"
+  #    ip : "127.0.0.1"
       port : 20000
   #-   name: "jsonrpc"
   #    ip: "127.0.0.1"
   #    port: 20001
->>>>>>> upstream/master
 
 protocol_conf:
   dubbo: