GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Missed a couple of conflicts

This commit is contained in:
Zach Copley 2011-02-28 15:51:46 -08:00
parent b7d0746694
commit f3ffc8bc46
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/imsettings.php
View File

@ -207,12 +207,7 @@ class ImsettingsAction extends SettingsAction
* *
* @return Confirm_address address object for this user * @return Confirm_address address object for this user
*/ */
<<<<<<< HEAD
function getConfirmation($transport) function getConfirmation($transport)
=======
function getConfirmation()
>>>>>>> 0.9.x
{ {
$user = common_current_user(); $user = common_current_user();

8
lib/userprofile.php
View File

@ -192,15 +192,7 @@ class UserProfile extends Widget
$tags = Profile_tag::getTags($this->profile->id, $this->profile->id); $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
if (count($tags) > 0) { if (count($tags) > 0) {
<<<<<<< HEAD
$this->out->elementStart('ul', 'tags xoxo entity_tags'); $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) { foreach ($tags as $tag) {
$this->out->elementStart('li'); $this->out->elementStart('li');
// Avoid space by using raw output. // Avoid space by using raw output.