fix(ras-acc): cleanup merge conflict markup

chickenn00dle commented 4 months ago

[ ] Have you followed the Newspack Contributing guideline?
[ ] Does your code follow the WordPress' coding standards and VIP Go coding standards?
[ ] Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Left some merge conflict markup while merging trunk 🙇

This PR cleans it up!

[ ] Have you added an explanation of what your changes do and why you'd like us to include them?
[ ] Have you written new tests for your changes, as applicable?
[ ] Have you successfully ran tests with your changes locally?

matticbot commented 4 months ago

:tada: This PR is included in version 1.91.0-epic-ras-acc.2 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

matticbot commented 4 months ago

:tada: This PR is included in version 1.92.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

matticbot commented 3 months ago

:tada: This PR is included in version 1.93.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

matticbot commented 3 months ago

:tada: This PR is included in version 2.1.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

matticbot commented 3 days ago

:tada: This PR is included in version 2.3.0-epic-ras-acc.1 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

Automattic / newspack-theme