Remove merge conflict for 21.7.0 release branch

[twisted-trac]

	@adiroiban reported
Trac ID	trac#10234
Type	enhancement
Created	2021-07-20 15:22:09Z

The release branch has a merge conflict with trunk.

If a GitHub PR has a conflict, the pull_request jobs are not executed.

Under normal circumstances this is fixed by merging trunk into the PR branch...

but the PR branch is the release branch which should be merged only after the release.

Searchable metadata

trac-id__10234 10234
type__enhancement enhancement
reporter__adiroiban adiroiban
priority__normal normal
milestone__None None
branch__ 
branch_author__ 
status__closed closed
resolution__fixed fixed
component__core core
keywords__review review
time__1626794529327162 1626794529327162
changetime__1626796392783798 1626796392783798
version__None None
owner__Adi_Roiban__adiroiban_____ Adi Roiban <adiroiban@...>

[twisted-trac]

	@adiroiban commented

PR at #1635

[twisted-trac]

	@adiroiban set owner to @adiroiban @adiroiban set status to closed

In changeset 9d62a9a

#!CommitTicketReference repository="" revision="9d62a9a57d01958f11fde7ffbfe3eadb9a40cb60"
Merge pull request #1635 from twisted/fix-21.7.0-release-pr

[10234] Delete file to prevent merge conflicts for the 21.7.0 PR.

Author: adiroiban
Reviewer: graingert
Fixes: ticket:10234