Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
2008-07-09 18:46:30 -04:00
parent 67921b1c18
commit 4b656f47df
31 changed files with 120 additions and 114 deletions
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -201,6 +201,6 @@ create table queue_item (
    claimed datetime comment 'date this item was claimed',

    index queue_item_created_idx (created)
-    
+
 ) ENGINE=MyISAM;