merge error in util.php

2009-06-10 09:14:48 -07:00 · 2009-06-10 09:14:48 -07:00 · 5469e46ef5
commit 5469e46ef5
parent c0853e3040
1 changed files with 0 additions and 1 deletions
--- 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;