try to fix merge conflict
authordemeritcowboy <demeritcowboy@hotmail.com>
Fri, 17 Nov 2023 19:25:56 +0000 (14:25 -0500)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2023 19:25:56 +0000 (14:25 -0500)
commitb3be4a702ff9b819ab3611d3d7d5154a1c21807f
treef9b3b9e8e6be325f99bdf2d900e6f0ade50164b4
parentb71574647d98ca4465d069bc310de9a876d3f2f9
try to fix merge conflict
ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php