1
0
mirror of https://github.com/danog/PHP-Parser.git synced 2025-01-22 22:01:18 +01:00

Clean merge leftover in changelog (#456)

This commit is contained in:
Tomáš Votruba 2017-12-26 17:25:14 +01:00 committed by Nikita Popov
parent aa289c9694
commit ceb4932ca8

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
Version 4.0.0-dev Version 4.0.0-dev
----------------- -----------------