aboutsummaryrefslogtreecommitdiffstats
path: root/git-tools/merge.php
diff options
context:
space:
mode:
Diffstat (limited to 'git-tools/merge.php')
-rwxr-xr-xgit-tools/merge.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-tools/merge.php b/git-tools/merge.php
index cbd84b896f..034bd2032c 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -4,7 +4,7 @@
*
* @package phpBB3
* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/