trying again to fix conflict
authordemeritcowboy <demeritcowboy@hotmail.com>
Fri, 17 Nov 2023 19:27:21 +0000 (14:27 -0500)
committerGitHub <noreply@github.com>
Fri, 17 Nov 2023 19:27:21 +0000 (14:27 -0500)
commit446e2f52caac5bfc5290ea827ec193745fb5e2ac
treebb7aed6c74261a644a84451323d508252506d5ff
parentb3be4a702ff9b819ab3611d3d7d5154a1c21807f
trying again to fix conflict
ext/civicrm_admin_ui/managed/SavedSearch_Manage_Contribution_Pages.mgd.php