summaryrefslogtreecommitdiff
path: root/ext/intl/timezone/timezone_methods.cpp
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2014-09-21 00:29:48 +0100
committerAndrea Faulds <ajf@ajf.me>2014-09-21 00:29:48 +0100
commit12b15e5ca4ae7ebf6e50551a4c666ece97068074 (patch)
treeaf4eaae6897444c3d8a987d59b695984a26d25d7 /ext/intl/timezone/timezone_methods.cpp
parent545c296ef4b5ffdb1cf59583c55129f08d75601b (diff)
parent6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff)
downloadphp-git-12b15e5ca4ae7ebf6e50551a4c666ece97068074.tar.gz
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/intl/timezone/timezone_methods.cpp')
-rw-r--r--ext/intl/timezone/timezone_methods.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index 530e6c5bed..033b216cdf 100644
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |