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

[quix0rs-gnu-social.git] / classes / Remember_me.php

diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index 92a1e461771a803a695b8c31d83cfe8946a31f7c..31a09ab4131a219d04699e3d46c49fdcfcc42d16 100644 (file)
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -4,7 +4,7 @@
  */
 require_once 'DB/DataObject.php';
 
-class Remember_me extends DB_DataObject 
+class Remember_me extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -19,6 +19,6 @@ class Remember_me extends DB_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-       
+
     function sequenceKey() { return array(false, false); }
 }