From 4ac18c1e43772444baf1dd217c927098f2828de7 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Fri, 7 Aug 2015 23:05:29 +0530
Subject: [PATCH] CRM-16526, removed conflict message

----------------------------------------
* CRM-16526: ACLs for Financial Types
  https://issues.civicrm.org/jira/browse/CRM-16526
---
 templates/CRM/Form/basicForm.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/CRM/Form/basicForm.tpl b/templates/CRM/Form/basicForm.tpl
index 28deca039d..0d5959007e 100644
--- a/templates/CRM/Form/basicForm.tpl
+++ b/templates/CRM/Form/basicForm.tpl
@@ -25,8 +25,7 @@
 *}
 <div class="crm-block crm-form-block crm-{$formName}-block">
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    {if $formName == "Contribute_Preferences" }
-<<<<<<< HEAD
+    {if $formName == "Contribute_Preferences"}
       <table class = "form-layout">
         <tr class="crm-miscellaneous-form-block-cvv-backoffice-required">
           <td class="label">{$form.cvv_backoffice_required.label}</td>
-- 
2.25.1