danog/PHP-Parser
1
0
Fork 0
mirror of https://github.com/danog/PHP-Parser.git synced 2025-01-22 22:01:18 +01:00
Code Issues Projects Releases Wiki Activity

Clean merge leftover in changelog (#456)

Browse Source
This commit is contained in:
Tomáš Votruba 2017-12-26 17:25:14 +01:00 committed by Nikita Popov
parent aa289c9694
commit ceb4932ca8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
Version 4.0.0-dev Version 4.0.0-dev
----------------- -----------------
@ -491,4 +490,4 @@ A more detailed description of backwards incompatible changes can be found in th
**This changelog only includes changes from the 2.0 series. For older changes see the **This changelog only includes changes from the 2.0 series. For older changes see the
[1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the [1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the
[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).** [0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).**