Fix merge leftovers in changelog

easysoft · Feb 28, 2018 · ae52aad · ae52aad
1 parent 9cea940
commit ae52aad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,7 @@
-<<<<<<< HEAD
 Version 4.0.0-dev
 -----------------
 
-Nothing yet.
+* No significant changes since the beta 1 release.
 
 Version 4.0.0-beta1 (2018-01-27)
 --------------------------------
@@ -109,14 +108,6 @@ Version 4.0.0-alpha1 (2017-10-18)
 * The `BuilderAbstract` class has been removed. It's functionality is moved into `BuilderHelpers`.
   However, this is an internal class and should not be used directly.
 
-Version 3.1.5-dev
-=======
-Version 3.1.6-dev
->>>>>>> 3.x
------------------
-
-Nothing yet.
-
 Version 3.1.5 (2018-02-28)
 --------------------------
 

diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -6,7 +6,7 @@ Upgrading from PHP-Parser 3.x to 4.0
 PHP-Parser now requires PHP 7.0 or newer to run. It is however still possible to *parse* PHP 5.2-5.6
 source code, while running on a newer version.
 
-Because HHVM does not support PHP 7, HHVM is no longer supported.
+HHVM is no longer actively supported.
 
 ### Changes to the node structure