diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-13 05:40:49 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-13 05:40:49 +0000 |
| commit | 54fbc2727066eaa2e5311757e7f7b121b3db5d1a (patch) | |
| tree | da78995dbf62ec9effadacfba0ffa6097be17c55 /ext/xml/compat.c | |
| parent | f77be645bccd73ace0ea3a0870b907523746181c (diff) | |
| parent | 9593663d2245e50a4422d66f44c603276e89b9ac (diff) | |
| download | php-git-54fbc2727066eaa2e5311757e7f7b121b3db5d1a.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'ext/xml/compat.c')
| -rw-r--r-- | ext/xml/compat.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 30b9ff3030..d39afacc0b 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -599,13 +599,6 @@ has been defined and none can be detected */ error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final); if (error) { -<<<<<<< HEAD - return 0; - } else { - return 1; - } else if (parser->parser->lastError.level > XML_ERR_WARNING ){ -======= ->>>>>>> PHP-7.1 return 0; } else { return 1; |