com php-src: fixup, both catched by nikic: ext/standard/tests/f ile/filetype_variation2.phpt travis/de
| From: | Ferenc Kovacs | Date: | Mon, 24 Aug 2015 15:02:25 +0000 |
| Subject: | com php-src: fixup, both catched by nikic: ext/standard/tests/f ile/filetype_variation2.phpt travis/de | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89464@lists.php.net to get a copy of this message | ||
Commit: 95a0b11d0aec133168e0a2e03b79caf2fe1aab03
Author: Ferenc Kovacs <tyrael@php.net> Mon, 24 Aug 2015 17:02:25 +0200
Parents: e93d7953df5ae596c820ed6f3af4a86e9ab5f744
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=95a0b11d0aec133168e0a2e03b79caf2fe1aab03
Log:
fixup, both catched by nikic
Changed paths:
M ext/standard/tests/file/filetype_variation2.phpt
D travis/de
Diff:
diff --git a/ext/standard/tests/file/filetype_variation2.phpt
b/ext/standard/tests/file/filetype_variation2.phpt
index bf1d321..125b48c 100644
--- a/ext/standard/tests/file/filetype_variation2.phpt
+++ b/ext/standard/tests/file/filetype_variation2.phpt
@@ -8,7 +8,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip no /dev on Windows');
}
if (!file_exists("/dev/null")) {
- die('skip /dev/console not available');
+ die('skip /dev/null not available');
}
?>
--FILE--
diff --git a/travis/de b/travis/de
deleted file mode 100644
index ae49d96..0000000
--- a/travis/de
+++ /dev/null
@@ -1,2 +0,0 @@
-de_DE.UTF-8 UTF-8
-de_DE ISO-8859-1