From cb41b9135bd7feca8f984bf7e48354030641d38b Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 7 Mar 2017 12:10:52 -0800
Subject: [PATCH] fix broken merge

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

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index e3fe8152da..25362d98f1 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -627,6 +627,8 @@ Rectangle {
         var sortProperty = column ? column.role : "displayName";
         var before = (table.sortIndicatorOrder === Qt.AscendingOrder) ? -1 : 1;
         var after = -1 * before;
+        // get selection(s) before sorting
+        var selectedIDs = getSelectedSessionIDs();
         userModelData.sort(function (a, b) {
             var aValue = a[sortProperty].toString().toLowerCase(), bValue = b[sortProperty].toString().toLowerCase();
             switch (true) {
@@ -639,7 +641,6 @@ Rectangle {
 
         userModel.clear();
         var userIndex = 0;
-        // get selection(s) before sorting
         var newSelectedIndexes = [];
         userModelData.forEach(function (datum) {
             function init(property) {