From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 24 Aug 2015 15:02:25 +0000 (+0200)
Subject: fixup, both catched by nikic
X-Git-Tag: php-5.5.31~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95a0b11d0aec133168e0a2e03b79caf2fe1aab03;p=php

fixup, both catched by nikic
---

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