diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rhizicore.js | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js index d39471d1..0ac2f29a 100644 --- a/scripts/rhizicore.js +++ b/scripts/rhizicore.js @@ -1033,15 +1033,8 @@ function customSize(type) { } function expand(obj){ -<<<<<<< HEAD if (!obj.savesize) { obj.savesize = obj.size; } obj.size = Math.max(obj.savesize, obj.value.length); -======= - if (!obj.savesize) - obj.savesize = obj.size; - obj.size = Math.max(obj.savesize,obj.value.length); - ->>>>>>> #62 } |