diff options
| author | Anmol Agrawal <anmol1771@gmail.com> | 2014-10-01 21:22:41 +0530 |
|---|---|---|
| committer | Anmol Agrawal <anmol1771@gmail.com> | 2014-10-01 21:22:41 +0530 |
| commit | 66a993bd86d651e20bd6db1c257d0ce0190ad09c (patch) | |
| tree | 50a37b4d1fb744e145b342ccc5d7d3f6f870db36 /scripts/rhizicore.js | |
| parent | 9f9215499c2e2e248b604515d6741d17e78d9062 (diff) | |
| parent | cb00ca7ca7fff56ab35f0d2d7def54d9725eb601 (diff) | |
Merge branch '#62' into Prototype
Conflicts:
index.html
scripts/rhizicore.js
Diffstat (limited to 'scripts/rhizicore.js')
| -rw-r--r-- | scripts/rhizicore.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js index 0ac2f29a..d39471d1 100644 --- a/scripts/rhizicore.js +++ b/scripts/rhizicore.js @@ -1033,8 +1033,15 @@ 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 } |