Attempt 2 at fixing merge conflict - Githubissues

tinymce / tinymce-docs

TinyMCE Documentation

https://www.tiny.cloud/docs/

Other

87 stars 221 forks source link

Attempt 2 at fixing merge conflict #3357

Closed FarzadHayat closed 3 weeks ago

FarzadHayat commented 3 weeks ago

Ticket: DOC-2446

Changes:

Attempt 2 at fixing merge conflict

Pre-checks:

[x] Branch prefixed with feature/<version>/, hotfix/<version>/, staging/<version>/, or release/<version>/
[ ] modules/ROOT/nav.adoc has been updated (if applicable)
[ ] Files has been included where required (if applicable)
[ ] Files removed have been deleted, not just excluded from the build (if applicable)
[ ] Files added for New product features, and included a release note entry.

Review:

[ ] Documentation Team Lead has reviewed