CRM-16526, removed conflict message
authorPradeep Nayak <pradpnayak@gmail.com>
Fri, 7 Aug 2015 17:35:29 +0000 (23:05 +0530)
committerPradeep Nayak <pradpnayak@gmail.com>
Mon, 21 Sep 2015 10:42:48 +0000 (16:12 +0530)
commit4ac18c1e43772444baf1dd217c927098f2828de7
tree451747f79fb63d8a5946769ed24186bd4dbce75f
parent0d6681544c746e58a9078c003286b945331ceef8
CRM-16526, removed conflict message

----------------------------------------
* CRM-16526: ACLs for Financial Types
  https://issues.civicrm.org/jira/browse/CRM-16526
templates/CRM/Form/basicForm.tpl