From 5ca095a7263fa431559fd12547d644aa1ab850d2 Mon Sep 17 00:00:00 2001
From: fangyincheng <fangyincheng@sina.com>
Date: Thu, 6 Jun 2019 14:16:31 +0800
Subject: [PATCH] Fix:fix conflict
---
examples/dubbo/go-server/profiles/dev/server.yml | 11 +----------
examples/dubbo/go-server/profiles/release/server.yml | 11 +----------
examples/dubbo/go-server/profiles/test/server.yml | 11 +----------
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/examples/dubbo/go-server/profiles/dev/server.yml b/examples/dubbo/go-server/profiles/dev/server.yml
index 5f877efa8..619f2ddca 100644
--- a/examples/dubbo/go-server/profiles/dev/server.yml
+++ b/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:
diff --git a/examples/dubbo/go-server/profiles/release/server.yml b/examples/dubbo/go-server/profiles/release/server.yml
index cecd8d4dd..c4d98eb74 100644
--- a/examples/dubbo/go-server/profiles/release/server.yml
+++ b/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:
diff --git a/examples/dubbo/go-server/profiles/test/server.yml b/examples/dubbo/go-server/profiles/test/server.yml
index cecd8d4dd..c4d98eb74 100644
--- a/examples/dubbo/go-server/profiles/test/server.yml
+++ b/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:
--
GitLab