From c80cb79796a53982d1b562957478455f98ffc4c5 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 27 Oct 2020 16:42:26 +0300 Subject: [PATCH] Fix conflict --- NEWS | 7 ------- 1 file changed, 7 deletions(-) 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 to object \FTPConnection. (Sara) -- 2.50.1