Fix merge

NeurophysVis · Dec 7, 2015 · abb1230 · abb1230
1 parent a680235
commit abb1230
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/app/js/main.js b/app/js/main.js
@@ -1727,13 +1727,6 @@
           freqSlider.property('value', fAx[curFreqInd]);
           freqSliderText.text(fAx[curFreqInd] + ' Hz');
 
-<<<<<<< HEAD
-          mouseFlag = true;
-          svgNetworkMap.select('text#HOLD').remove();
-
-          force.stop();
-=======
->>>>>>> develop
           loadEdges();
         });
     }