commit 99d3f7f0635626778f5c49c93840075347141ed0
author andrewonlab <andrew@onlab.us> Thu Nov 13 17:45:08 2014 -0500
committer andrewonlab <andrew@onlab.us> Thu Nov 13 17:45:08 2014 -0500
tree 3465a17d94d567a1758d12f46b3ce3755cd3665e
parent 9dfd208f3d11f83c48f951e3c2c96f551ab3c2ab
parent 2ebbe6f1d28abf9bcbb103f22b685916c3b4bff8

fixing merge conflict

TestON/drivers/common/cli/onosdriver.py

diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index ca1e30c..fd9fef4 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -760,8 +760,8 @@
             main.log.info(self.name+" ::::::")
             main.cleanup()
             main.exit()
-
-    def onos_uninstall(self, node_ip = ""):
+    
+    def onos_uninstall(self, node_ip=""):
         '''
         Calls the command: 'onos-uninstall'
         Uninstalls ONOS from the designated cell machine, stopping