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
---
 classes/User_openid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/User_openid.php')

diff --git a/classes/User_openid.php b/classes/User_openid.php
index 67f6f3b2e..b199685f8 100644
--- 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 */
-- 
cgit v1.2.3-54-g00ecf