From 4b656f47dff2bd6eed4dcfad060b8434d052d883 Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Wed, 9 Jul 2008 18:46:30 -0400
Subject: Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
---
 db/laconica.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'db')

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;
 
-- 
cgit v1.2.3-54-g00ecf