Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-04-22-25-32

[civicrm-core.git] / templates / CRM / Event / Form / ManageEvent / Conference.tpl

diff --git a/templates/CRM/Event/Form/ManageEvent/Conference.tpl b/templates/CRM/Event/Form/ManageEvent/Conference.tpl
index 05a5ffa5b7132c7eeaa335d95da083f76aa8fa54..c82bb8cbf02996b81f64af8b07229cfd0a0d5c05 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/Conference.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Conference.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -59,5 +59,3 @@
         {include file="CRM/common/formButtons.tpl" location="bottom"}
     </div>
 </div>
-
-{include file="CRM/common/formNavigate.tpl"}