merge conflict

nashwaan · Apr 25, 2017 · a4aab32 · a4aab32
2 parents 818a4d2 + 85632fa
commit a4aab32
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/lib/js2xml.js b/lib/js2xml.js
@@ -106,7 +106,11 @@ function hasContent (element, options, skipText) {
                 case options.attributesKey:
                     break; // skip to next key
                 case options.cdataKey:
+<<<<<<< HEAD
                 case options.doctypeKey:
+=======
+                    return false;
+>>>>>>> origin/master
                 case options.commentKey:
                 case options.declarationKey:
                     return true;
@@ -147,8 +151,12 @@ function writeElementsCompact (element, options, depth, firstLine) {
                 case options.declarationKey: xml += writeDeclaration(element[options.declarationKey], options); break;
                 case options.attributesKey: case options.parentKey: break; // skip
                 case options.textKey: xml += writeText(element, options); break;
+<<<<<<< HEAD
                 case options.cdataKey: xml += writeIndentation(options, depth, firstLine) + writeCdata(element, options); break;
                 case options.doctypeKey: xml += writeIndentation(options, depth, firstLine) + writeDoctype(element, options); break;
+=======
+                case options.cdataKey: xml += writeCdata(element, options); break;
+>>>>>>> origin/master
                 case options.commentKey: xml += writeIndentation(options, depth, firstLine) + writeComment(element, options); break;
                 default:
                     if (element[key] instanceof Array) {