diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-10-27 16:42:26 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-10-27 16:42:26 +0300 |
| commit | c80cb79796a53982d1b562957478455f98ffc4c5 (patch) | |
| tree | 92318b9f0676a498febd1a11726ab49275630e6f /NEWS | |
| parent | 1f1dbd7f488e8212f25872831ef7446d61e7b2e6 (diff) | |
| download | php-git-c80cb79796a53982d1b562957478455f98ffc4c5.tar.gz | |
Fix conflict
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 7 |
1 files changed, 0 insertions, 7 deletions
@@ -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) |