Merge branch '4.6' into master

[civicrm-core.git] / CRM / Admin / Form / Preferences / Campaign.php

diff --git a/CRM/Admin/Form/Preferences/Campaign.php b/CRM/Admin/Form/Preferences/Campaign.php
index 0de208a7c59a80251a980c386e0fc716a066d70a..3fe64852381ffa1e3dee3a703e70be2ddb4c88c6 100644 (file)
--- a/CRM/Admin/Form/Preferences/Campaign.php
+++ b/CRM/Admin/Form/Preferences/Campaign.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id: Display.php 36505 2011-10-03 14:19:56Z lobo $
  *
  */
@@ -59,4 +59,5 @@ class CRM_Admin_Form_Preferences_Campaign extends CRM_Admin_Form_Preferences {
 
     parent::preProcess();
   }
+
 }