Commit acdb5ab0 authored by konovalovsergey's avatar konovalovsergey

error while merge style xf, table and conditionalFormating

parent 1e2fcf55
...@@ -1387,7 +1387,7 @@ Align.prototype = ...@@ -1387,7 +1387,7 @@ Align.prototype =
{ {
_mergeProperty : function(first, second, def) _mergeProperty : function(first, second, def)
{ {
if(false == def.isEqual(first)) if (def != first)
return first; return first;
else else
return second; return second;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment