commit ccfb0d5b02bbd3240a48eaa2cc712e7f650083d1
author Hari Krishna <hari@onlab.us> Thu Feb 19 09:38:29 2015 -0800
committer Hari Krishna <hari@onlab.us> Thu Feb 19 09:38:29 2015 -0800
tree c39ac9461667bf1234877487d3b51236ce0187c3
parent ca42b0a2f968fc1f368f71a8a4c89db558320380

fixed merge conflict

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index cb9549b..c38da9f 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -901,12 +901,10 @@
                            str( hostIdOne ) + " and " + str( hostIdTwo ) )
                 return main.TRUE
 
-<<<<<<< HEAD
         except TypeError:
             main.log.exception( self.name + ": Object not as expected" )
             return None
-=======
->>>>>>> 1c7509b87a65d457eaf41f5551e560f1aa2ea0df
+
         except pexpect.EOF:
             main.log.error( self.name + ": EOF exception found" )
             main.log.error( self.name + ":    " + self.handle.before )