From d3700fc9229c1ad9323a733202dff522d9cb7dd4 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 28 Dec 2016 15:47:28 -0800
Subject: [PATCH] Fix merge errors

---
 interface/resources/qml/hifi/Pal.qml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index eb35664707..819da7eea5 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -212,14 +212,14 @@ Item {
                     datum[styleData.role] = model[styleData.role] = newValue
                     if (styleData.role === "personalMute") {
                         Users[styleData.role](model.sessionId, newValue)
-                    } else if (styleData.role === 'ignore') {
+                    } else if (styleData.role === "ignore") {
                         var key = styleData.role;
                         if (!newValue) {
                             key = 'un' + key;
                         }
                         if (newValue) {
                             ignored[datum.sessionId] = datum;
-                            console.log('fixme hrs adding to ignored', JSON.stringify(datum), 'at', datum.sessionId);
+                            console.log("fixme hrs adding to ignored", JSON.stringify(datum), "at", datum.sessionId);
                         } else {
                             delete ignored[datum.sessionId];
                         }    
@@ -232,6 +232,7 @@ Item {
                         sortModel()
                     }
                 }
+            }
         }
     }
     // Refresh button