Oops on conflict management.

I am SO sorry I missed this.
n00dlestheindelible · Jun 12, 2011 · fe3f349 · fe3f349
1 parent a5eeb7c
commit fe3f349
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/views/updates/_list.haml b/views/updates/_list.haml
@@ -27,10 +27,6 @@
           %a{:href => "/updates/#{update.referral.id}"}
             in reply to
             %span.name= update.referral.author.username
-      -elsif not update.referral_url.nil?
-        .in-reply
-          %a{:href => update.referral_url}
-            in reply to
 
       .actions
         -# when @timeline is true, this is a list on the user's page
@@ -49,10 +45,3 @@
       There are no updates here yet
 
 != haml :"shared/_pagination"
-
-<<<<<<< HEAD
-- if updates.empty?
-  .empty
-    #{locals[:tagline] || "There are no updates here yet."}
-=======
->>>>>>> sidebar help block added, main menu updated