commit fc44432ed14ce59758240b9d3acd4996f17ae657
author jhall11 <jhall@onlab.us> Thu Jan 30 11:59:03 2014 -0800
committer admin <admin@TestStation.(none)> Thu Jan 30 11:59:03 2014 -0800
tree a3ad3e7f312f917f4aafd5fd4ae7e3087e2d4942
parent 7f77915d3b666b9b6129175e783f069a9bc5bb56

Resolve Merge conflict

TestON/tests/MininetTest/MininetTest.topo

diff --git a/TestON/tests/MininetTest/MininetTest.topo b/TestON/tests/MininetTest/MininetTest.topo
index baf59a6..21d54de 100644
--- a/TestON/tests/MininetTest/MininetTest.topo
+++ b/TestON/tests/MininetTest/MininetTest.topo
@@ -66,15 +66,9 @@
             <connect_order>9</connect_order>
         </ONOS4>
         <Mininet1>
-<<<<<<< HEAD
             <host>10.128.100.11</host>
             <user>admin</user>
             <password></password>
-=======
-            <host>10.128.100.15</host>
-            <user>user_one</user>
-            <password></password>
->>>>>>> 229277f2a177afe10c76af83686b38645fe2abe3
             <type>MininetCliDriver</type>
             <COMPONENTS>
                 # Specify the Option for mininet