Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -re4378bd07ad6b5f2a71973728d6be2ffc9bc6054 -r047ceb6dfaaa7fafd5580d141dbf32b68c0c4147
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision e4378bd07ad6b5f2a71973728d6be2ffc9bc6054)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 047ceb6dfaaa7fafd5580d141dbf32b68c0c4147)
@@ -1214,7 +1214,6 @@
     except:
         return False
         
-        
 def get_message_from_log(file_name, message_text):
     
     """
@@ -1360,3 +1359,8 @@
         content_record.append(ack_bak_status)
     return content_record
 
+=======
+    raise LookupError("zone object is not in view to the user after " + \
+             "trying 100 times")
+    
+>>>>>>> settings