Still trying to resolve merge conflicts...

Signed-off-by: Michael Eshom <[email protected]>

Themes/default/Profile.template.php

@@ -602,6 +602,7 @@ function template_editBuddies()
 			<tr class="catbg">
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
+
 	if (allowedTo('moderate_forum'))
 		echo '
 				<th scope="col">', $txt['email'], '</th>';
@@ -713,6 +714,7 @@ function template_editIgnoreList()
 			<tr class="catbg">
 				<th class="first_th" scope="col" width="20%">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
+
 	if (allowedTo('moderate_forum'))
 		echo '
 				<th scope="col">', $txt['email'], '</th>';
@@ -3164,4 +3166,4 @@ function template_authentication_method()
 	// ]]></script>';
 }
 
-?>
+?>