aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'git-tools/merge.php')
-rwxr-xr-xgit-tools/merge.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/git-tools/merge.php b/git-tools/merge.php
index f6142095fb..a9bb051401 100755
--- a/git-tools/merge.php
+++ b/git-tools/merge.php
@@ -2,9 +2,13 @@
<?php
/**
*
-* @package phpBB3
-* @copyright (c) 2011 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
*
*/