From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 27 Oct 2020 13:42:26 +0000 (+0300)
Subject: Fix conflict
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c80cb79796a53982d1b562957478455f98ffc4c5;p=php

Fix conflict
---

diff --git a/NEWS b/NEWS
index 17d9784b80..5fc105a2f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-<<<<<<< HEAD
 ?? ??? ????, PHP 8.1.0alpha1
-=======
-?? ??? ????, PHP 8.0.0RC4
-
-
-29 Oct 2020, PHP 8.0.0RC3
->>>>>>> PHP-8.0
 
 - FTP:
   . Convert resource<ftp> to object \FTPConnection. (Sara)