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

[quix0rs-gnu-social.git] / db / laconica.sql

diff --git a/db/laconica.sql b/db/laconica.sql
index 4a89544d8014f145f7b36baebd8d46f1382e812a..42a00da3f0c1b62011cab9603ea1ba14a88f7036 100644 (file)
--- 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;