diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-03 07:15:14 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-03 07:15:14 +0100 |
| commit | a87434bda8b7c2222dc5ea7b6ad05a4467e34adf (patch) | |
| tree | d5a8f5c3b9d90ee88e144afd7550d7ca8fde6cb8 /.gitattributes | |
| parent | ca6d701994c047abbae9bff4564ec2c84b8b0a93 (diff) | |
| parent | 2019b25daa7fbe257fc72f31d18f54f1fa91e452 (diff) | |
| download | php-git-a87434bda8b7c2222dc5ea7b6ad05a4467e34adf.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove ident gitattribute for ext/zip/php_zip.c
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 6d0419887d..f60bcf700c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,7 +15,6 @@ ext/dba/libflatfile/flatfile.c ident ext/dba/libcdb/cdb_make.c ident ext/dba/libcdb/cdb.c ident ext/filter/filter.c ident -ext/zip/php_zip.c ident README.input_filter ident run-tests.php ident Zend/RFCs/002.txt ident |