From 67930088927c9aef7250e0f1ccf59120f7f8b1e3 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Fri, 21 Apr 2017 11:21:28 -0500
Subject: [PATCH] remove conditional

---
 app/assets/templates/frontend/notes.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/templates/frontend/notes.html.haml b/app/assets/templates/frontend/notes.html.haml
index d61dc9e0f..0a698af2d 100644
--- a/app/assets/templates/frontend/notes.html.haml
+++ b/app/assets/templates/frontend/notes.html.haml
@@ -29,7 +29,7 @@
         .note{"ng-repeat" => "note in (ctrl.sortedNotes = (ctrl.tag.notes | filter: ctrl.filterNotes | orderBy: ctrl.sortBy:true | limitTo:ctrl.notesToDisplay))",
             "ng-click" => "ctrl.selectNote(note)", "ng-class" => "{'selected' : ctrl.selectedNote == note}"}
           %strong.red.medium{"ng-if" => "note.conflict_of"} Conflicted copy
-          .name{"ng-if" => "note.title || note.conflict_of"}
+          .name{"ng-if" => "note.title"}
             {{note.title}}
           .note-preview
             {{note.text}}