summaryrefslogtreecommitdiffstats
path: root/php-pear/php/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'php-pear/php/CONFLICTS')
-rwxr-xr-xphp-pear/php/CONFLICTS6
1 files changed, 1 insertions, 5 deletions
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS
index 7703bf30e4..f512999a03 100755
--- a/php-pear/php/CONFLICTS
+++ b/php-pear/php/CONFLICTS
@@ -2,8 +2,4 @@
conflicts php-dev &&
conflicts php4 &&
-
-# PHP >=5.3 includes fileinfo
-if spell_ok fileinfo && is_version_less 5.2.9999 "${VERSION}"; then
- conflicts fileinfo y
-fi
+conflicts fileinfo y