merge error in util.php

diff --git a/lib/util.php b/lib/util.php
index 9872d97c4895f8f66cbae97ae4bf565cf817623d..b3a94a5a011ffe1d947d907a5ceb4e690f0548d1 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -922,7 +922,6 @@ function common_enqueue_notice_transport($notice, $transport)
         $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
         common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
         throw new ServerException('DB error inserting queue item: ' . $last_error->message);
->>>>>>> 0.7.x:lib/util.php
     }
     common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id . ' for ' . $transport);
     return true;