X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FDedupe%2FMerger.php;h=a49f15c5467dcf1399bd0f11d9e25204875eabc8;hb=ee9c028679b097f6f7e92f367a6cb8da3fd54037;hp=9c938ebaf6f6d47e8c2b45f200e0409c43b0a9a9;hpb=82e7a8b8a4054c4814900ddf5e8fc56d6819c134;p=civicrm-core.git diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 9c938ebaf6..a49f15c546 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.6 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2014 | + | Copyright CiviCRM LLC (c) 2004-2015 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2014 + * @copyright CiviCRM LLC (c) 2004-2015 * $Id$ * */ @@ -156,7 +156,7 @@ class CRM_Dedupe_Merger { } /** - * Returns the related tables groups for which a contact has any info entered + * Returns the related tables groups for which a contact has any info entered. */ public static function getActiveRelTables($cid) { $cid = (int) $cid; @@ -243,7 +243,7 @@ WHERE } /** - * Return tables using locations + * Return tables using locations. */ public static function locTables() { static $locTables;