# HG changeset patch # User Evi Huber # Date 1467624402 -7200 # Node ID 9182430b79d748f4f4a915fe29503812fc0f6bfe # Parent 8280cd5694e5449d86ac58c2cca80c94628d9005# Parent e552e82ceb8a5ee06ffffc2fa6b3c27e2cfa3fe1 Merge diff -r e552e82ceb8a -r 9182430b79d7 app/view/window/ProbeEdit.js --- a/app/view/window/ProbeEdit.js Fri Jul 01 14:12:54 2016 +0200 +++ b/app/view/window/ProbeEdit.js Mon Jul 04 11:26:42 2016 +0200 @@ -24,7 +24,6 @@ collapsible: true, maximizable: true, autoShow: true, - autoScroll: true, layout: 'fit', constrain: true,