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

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz

1 files changed, 1 insertions, 1 deletions

diff --git a/db/laconica.sql b/db/laconica.sql
index 4a89544d8..42a00da3f 100644
--- 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;