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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/util.php b/lib/util.php
index f4245693f..1af5d1177 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -95,7 +95,7 @@ function common_element_start($tag, $attrs=NULL) {
 function common_element_end($tag) {
 	static $empty_tag = array('base', 'meta', 'link', 'hr',
 							  'br', 'param', 'img', 'area',
-							  'input', 'col'); 
+							  'input', 'col');
 	global $xw;
 	# XXX: check namespace
 	if (in_array($tag, $empty_tag)) {
@@ -460,7 +460,7 @@ function common_set_user($user) {
 	} else if (!($user instanceof User)) {
 		return false;
 	}
-	
+
 	if ($user) {
 		common_ensure_session();
 		$_SESSION['userid'] = $user->id;