diff options
Diffstat (limited to 'admin_site_merge.php')
| -rw-r--r-- | admin_site_merge.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin_site_merge.php b/admin_site_merge.php index 71dfc8084b..56e9a4f71f 100644 --- a/admin_site_merge.php +++ b/admin_site_merge.php @@ -4,7 +4,7 @@ // This page will allow you to merge 2 gedcom records // // webtrees: Web based Family History software -// Copyright (C) 2013 webtrees development team. +// Copyright (C) 2014 webtrees development team. // // Derived from PhpGedView // Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. @@ -21,7 +21,7 @@ // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA define('WT_SCRIPT_NAME', 'admin_site_merge.php'); require './includes/session.php'; |