FIX: rerender discarded slots

src/components/EmissionManager.vue

@@ -270,12 +270,13 @@ export default {
     },
 
     resolveEvent (toResolve, mode) {
-      this.$log.debug('resolveEvent', toResolve)
       this.conflictCount -= toResolve.collisions.length
+      let slotIndex = this.calendarSlots.findIndex(s => s.id === toResolve.id)
       switch (mode) {
         case 'theirs':
           this.conflictSolutions[toResolve.hash] = 'theirs'
-          toResolve.className = 'discarded'
+          this.calendarSlots[slotIndex].className = 'ours-discarded'
+          this.renderView(null)
           break
 
         default:
@@ -396,8 +397,9 @@ a.currentShow {
 .noconflict {
   background-color: #17a2b8;
 }
-.discarded {
-  background-color: #eee;
-  text-decoration: line-through;
+.ours-discarded {
+  background-color: #b00;
+  opacity: 0.5;
+  text-decoration: line-through !important;
 }
 </style>