From 06a80c829b7e183f42bafd1dfd92b65f11dad42b Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 5 Oct 2008 14:16:14 -0400
Subject: [PATCH] Another patch to fix up whitespace conflicts in User.php

darcs-hash:20081005181614-7b5ce-4ab236108fe2570a199120317120d921715fbd19.gz
---
 classes/User.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index ce7632ec5b..036da2b888 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -143,9 +143,8 @@ class User extends Memcached_DataObject
 
 	function noticesWithFriendsWindow() {
 		
-		
 		$notice = new Notice();
-		
+
 		$notice->query('SELECT notice.* ' .
 					   'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
 					   'WHERE subscription.subscriber = ' . $this->id . ' ' .