CRM-17293 - Fix bad merge
authorColeman Watts <coleman@civicrm.org>
Fri, 9 Oct 2015 23:52:37 +0000 (19:52 -0400)
committerColeman Watts <coleman@civicrm.org>
Fri, 9 Oct 2015 23:52:37 +0000 (19:52 -0400)
commit992808d07efab779da785fe0a40709f183cd5a0a
tree2454920bcd3a8102a4a19914c63427db8e5688a2
parentf1277ab31a173d684b07640d0bb768960fef20db
CRM-17293 - Fix bad merge
CRM/Core/Payment.php