com php-src: fix merge issue: ext/fileinfo/data_file.c
| From: | Remi Collet | Date: | Tue, 25 Mar 2014 11:07:15 +0000 |
| Subject: | com php-src: fix merge issue: ext/fileinfo/data_file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76599@lists.php.net to get a copy of this message | ||
Commit: 5f0428e8cca7265c86606b966b269ef3006d00e8
Author: Remi Collet <remi@php.net> Tue, 25 Mar 2014 12:06:18 +0100
Parents: 98163c7d1b2deb6ae79d09007a32597a30c36e7e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f0428e8cca7265c86606b966b269ef3006d00e8
Log:
fix merge issue
Changed paths:
M ext/fileinfo/data_file.c
Diff: <Diff exceeded maximum size>