Remove stray merge msg
authorcolemanw <coleman@civicrm.org>
Thu, 16 Jul 2015 18:20:12 +0000 (14:20 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 16 Jul 2015 18:20:12 +0000 (14:20 -0400)
commitfb9b6238108cbeab42cd07fe7f55787165909249
treedf9ec407e2c33543c15d7677e8ed2e3bec66d0ab
parent9baa66cabcbf57e6616abbc4c77cdfcd47f5c54b
Remove stray merge msg
CRM/Core/Payment/Form.php