CRM-17169 -- Fix upgrade conflict
authorjitendrapurohit <jitendra.purohit@webaccessglobal.com>
Mon, 28 Sep 2015 09:37:37 +0000 (15:07 +0530)
committerjitendrapurohit <jitendra.purohit@webaccessglobal.com>
Mon, 28 Sep 2015 09:37:37 +0000 (15:07 +0530)
commitbe4d57936b559181826e360ddd710efe107673e9
tree27ff51e34f9d8cd74667844b46d971be43aa0cde
parent83ab3f2a6038873ed5141943e899583705089e93
CRM-17169 -- Fix upgrade conflict
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl
CRM/Upgrade/Incremental/sql/4.7.alpha2.mysql.tpl