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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/classes/Queue_item.php b/classes/Queue_item.php
index 964013f2c..4a7aeebe2 100644
--- a/classes/Queue_item.php
+++ b/classes/Queue_item.php
@@ -4,7 +4,7 @@
  */
 require_once 'DB/DataObject.php';
 
-class Queue_item extends DB_DataObject 
+class Queue_item extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -12,13 +12,13 @@ class Queue_item extends DB_DataObject
     public $__table = 'queue_item';                      // table name
     public $notice_id;                       // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
-    public $claimed;                         // datetime()  
+    public $claimed;                         // datetime()
 
     /* Static get */
     function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Queue_item',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-	
+
     function sequenceKey() { return array(false, false); }
 }