Commit f3ffc8bc authored by Zach Copley's avatar Zach Copley

Missed a couple of conflicts

parent b7d07466
......@@ -207,12 +207,7 @@ class ImsettingsAction extends SettingsAction
*
* @return Confirm_address address object for this user
*/
<<<<<<< HEAD
function getConfirmation($transport)
=======
function getConfirmation()
>>>>>>> 0.9.x
{
$user = common_current_user();
......
......@@ -192,15 +192,7 @@ class UserProfile extends Widget
$tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
if (count($tags) > 0) {
<<<<<<< HEAD
$this->out->elementStart('ul', 'tags xoxo entity_tags');
=======
$this->out->elementStart('dl', 'entity_tags');
// TRANS: DT for tags in a profile.
$this->out->element('dt', null, _('Tags'));
$this->out->elementStart('dd');
$this->out->elementStart('ul', 'tags xoxo');
>>>>>>> 0.9.x
foreach ($tags as $tag) {
$this->out->elementStart('li');
// Avoid space by using raw output.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment