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

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

diff --git a/classes/User_openid.php b/classes/User_openid.php
index 67f6f3b2efa592e419a68ff38bbcbacd98c99b41..b199685f8ed50ef377f3ac838a14e3126971e373 100644 (file)
--- a/classes/User_openid.php
+++ b/classes/User_openid.php
@@ -4,7 +4,7 @@
  */
 require_once 'DB/DataObject.php';
 
-class User_openid extends DB_DataObject 
+class User_openid extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */