auto delete conflicts and show conflict flag

app/assets/templates/frontend/directives/editor-menu.html.haml

@@ -14,6 +14,7 @@
       %li.menu-item{"ng-repeat" => "editor in editorManager.externalEditors", "ng-click" => "selectEditor(editor)"}
 
         .pull-left{"style" => "width: 60%"}
+          %strong.red.medium{"ng-if" => "editor.conflict_of"} Conflicted copy
           .menu-item-title {{editor.name}}
           %a.faded{"ng-if" => "!editor.default", "ng-click" => "setDefaultEditor(editor); $event.stopPropagation();"} Set Default
           %a.red{"ng-if" => "editor.default", "ng-click" => "removeDefaultEditor(editor); $event.stopPropagation();"} Remove Default

app/assets/templates/frontend/notes.html.haml

@@ -28,7 +28,8 @@
       .infinite-scroll{"infinite-scroll" => "ctrl.paginate()", "can-load" => "true", "threshold" => "200"}
         .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}"}
-          .name{"ng-if" => "note.title"}
+          %strong.red.medium{"ng-if" => "note.conflict_of"} Conflicted copy
+          .name{"ng-if" => "note.title || note.conflict_of"}
             {{note.title}}
           .note-preview
             {{note.text}}

app/assets/templates/frontend/tags.html.haml

@@ -16,6 +16,7 @@
           "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTag($event, tag)", "mb-autofocus" => "true", "should-focus" => "ctrl.newTag || ctrl.editingTag == tag",
           "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-blur" => "ctrl.saveTag($event, tag)", "spellcheck" => "false"}
           .count {{ctrl.noteCount(tag)}}
+        .red.small.bold{"ng-if" => "tag.conflict_of"} Conflicted copy
         .menu{"ng-if" => "ctrl.selectedTag == tag"}
           %a.item{"ng-click" => "ctrl.selectedRenameTag($event, tag)", "ng-if" => "!ctrl.editingTag"} Rename
           %a.item{"ng-click" => "ctrl.saveTag($event, tag)", "ng-if" => "ctrl.editingTag"} Save