commit 28dd15e0a7d2f338b00145c273eac8ce59f6de02
author Hyunsun Moon <hyunsun.moon@gmail.com> Wed Dec 16 04:19:17 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Dec 17 18:25:53 2015 +0000
tree 8025fed9f53ce9287b92f70be703646c0107cc55
parent 30d3f8be40c630c5afcb77083c5f14e2e66c45f6

Removed merge conflict comments

Change-Id: I1b52123584d797f01f18912ff266c105e57795d4

apps/openstackswitching/network-cfg.json

diff --git a/apps/openstackswitching/network-cfg.json b/apps/openstackswitching/network-cfg.json
index c185d55..abcd2d1 100644
--- a/apps/openstackswitching/network-cfg.json
+++ b/apps/openstackswitching/network-cfg.json
@@ -32,31 +32,19 @@
                 "nodes" : [
                     {
                         "hostname" : "compute-01",
-<<<<<<< HEAD
                         "ovsdbIp" : "10.40.101.208",
-=======
-                        "ovsdbIp" : "127.0.0.1",
->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
                         "ovsdbPort" : "6640",
                         "bridgeId" : "of:0000000000000001"
                      },
                      {
                         "hostname" : "compute-02",
-<<<<<<< HEAD
                         "ovsdbIp" : "10.40.101.227",
-=======
-                        "ovsdbIp" : "127.0.0.1",
->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
                         "ovsdbPort" : "6640",
                         "bridgeId" : "of:0000000000000002"
                      },
                      {
                          "hostname" : "network",
-<<<<<<< HEAD
                          "ovsdbIp" : "10.40.101.209",
-=======
-                         "ovsdbIp" : "127.0.0.1",
->>>>>>> 6a78e2e... SONA: OpenstackSwitching - remove flows
                          "ovsdbPort" : "6640",
                          "bridgeId" : "of:0000000000000003"
                      }