diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-03 07:15:02 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-03 07:15:02 +0100 |
| commit | 2019b25daa7fbe257fc72f31d18f54f1fa91e452 (patch) | |
| tree | 5664e00e1f991aaa080ce83d734c6c73ab97c8f9 | |
| parent | 03aef5f65cea1dac9db5fa8254b4776eba88441f (diff) | |
| parent | 7b248a1b3266c4d9e7c8e3f9842903225669d866 (diff) | |
| download | php-git-2019b25daa7fbe257fc72f31d18f54f1fa91e452.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove ident gitattribute for ext/zip/php_zip.c
| -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 |