Missed a couple of conflicts

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 4680b3292b15b26906d22889b0b54a2b277f326b..f45848a13de4f46de024655ed9437b3cd6a5d6c5 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -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();
 

diff --git a/lib/userprofile.php b/lib/userprofile.php
index 444bb081218c9e3bd6a42e4e6f94301568b68d35..0b7efb22fc6bceb6587374f3f6342a87a988784d 100644 (file)
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -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.