summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-08-24 17:02:25 +0200
committerFerenc Kovacs <tyrael@php.net>2015-08-24 17:02:25 +0200
commit95a0b11d0aec133168e0a2e03b79caf2fe1aab03 (patch)
tree25b95d62d9bbe9ee46aaee8ce1e574736614fb38
parente93d7953df5ae596c820ed6f3af4a86e9ab5f744 (diff)
downloadphp-git-95a0b11d0aec133168e0a2e03b79caf2fe1aab03.tar.gz
fixup, both catched by nikic
-rw-r--r--ext/standard/tests/file/filetype_variation2.phpt2
-rw-r--r--travis/de2
2 files changed, 1 insertions, 3 deletions
diff --git a/ext/standard/tests/file/filetype_variation2.phpt b/ext/standard/tests/file/filetype_variation2.phpt
index bf1d321f12..125b48c02c 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 ae49d969ee..0000000000
--- a/travis/de
+++ /dev/null
@@ -1,2 +0,0 @@
-de_DE.UTF-8 UTF-8
-de_DE ISO-8859-1