merged conflicts

This commit is contained in:
Ishwar Agarwal 2016-04-13 15:36:23 +00:00
commit 5937c0cc39

View file

@ -578,13 +578,12 @@ $(function() {
self.incrementLayer = function() {
var value = self.layerSlider.slider('getValue')+1;
self.shiftLayer(value);
}
};
self.decrementLayer = function() {
var value = self.layerSlider.slider('getValue')-1;
self.shiftLayer(value);
}
};
}
OCTOPRINT_VIEWMODELS.push([