summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-10-03 07:15:27 +0100
committerJoe Watkins <krakjoe@php.net>2017-10-03 07:15:27 +0100
commit6190824cf1527b645b2f24b63a66f4d750b561dc (patch)
treeda6b6397e03c05d7e419b68fae0241118ea87a9c /.gitattributes
parentd68879c73417695ff889a2b5b0ce7907db4ecddb (diff)
parenta87434bda8b7c2222dc5ea7b6ad05a4467e34adf (diff)
downloadphp-git-6190824cf1527b645b2f24b63a66f4d750b561dc.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Remove ident gitattribute for ext/zip/php_zip.c
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
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