merge conflict resolution
authorJon Goldberg <jon@megaphonetech.com>
Thu, 6 Jul 2023 22:38:49 +0000 (18:38 -0400)
committerJon Goldberg <jon@megaphonetech.com>
Thu, 6 Jul 2023 22:56:25 +0000 (18:56 -0400)
commit400eb1e847b10acfd1dafcc26e2dc9f8733b55d8
tree3d6a2a203a0b910d3d06fb9e1e6981d6144653ab
parent313d91e802f71e0fc36bb73f5f303f2514978dc8
merge conflict resolution
CRM/Contribute/Form/Contribution/Confirm.php
CRM/Contribute/Form/Contribution/Main.php
CRM/Contribute/Form/Contribution/ThankYou.php