Resolve conflicts with hawthorn/main 20221004

[shadinaif]

Change description

Resolve conflicts with hawthorn/main

Type of change

• Bug fix (fixes an issue)
• New feature (adds functionality)

Related issues

Related to: https://appsembler.atlassian.net/browse/RED-3387

Checklists

Development

• Lint rules pass locally
• Application changes have been tested thoroughly
• Automated tests covering modified code pass

Security

• Security impact of change has been considered
• Code follows company security practices and guidelines

Code review

• Pull request has a descriptive title and context useful to a reviewer. Screenshots or screencasts are attached as necessary
• "Ready for review" label attached and reviewers assigned
• Changes have been reviewed by at least one other contributor
• Pull request linked to task tracker where applicable

[github-actions]

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with	open-release/koa.master
Benchmark conflicts with main	111
Current conflicts	111
Summary	Good work! No added conflicts.

Comparing with	open-release/lilac.master
Benchmark conflicts with main	253
Current conflicts	253
Summary	Good work! No added conflicts.

Comparing with	open-release/maple.master
Benchmark conflicts with main	284
Current conflicts	284
Summary	Good work! No added conflicts.

Comparing with	open-release/nutmeg.master
Benchmark conflicts with main	292
Current conflicts	292
Summary	Good work! No added conflicts.

Comparing with	master
Benchmark conflicts with main	290
Current conflicts	290
Summary	Good work! No added conflicts.

[coveralls]

Pull Request Test Coverage Report for Build 3187912410

• 2 of 6 (33.33%) changed or added relevant lines in 1 file are covered.
• 1 unchanged line in 1 file lost coverage.
• Overall coverage increased (+0.005%) to 49.046%

---

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
openedx/core/djangoapps/appsembler/settings/settings/production_common.py	2	6	33.33%

Files with Coverage Reduction	New Missed Lines	%
openedx/core/djangoapps/content/block_structure/block_structure.py	1	94.86%

Totals
Change from base Build 3181073634:	0.005%
Covered Lines:	110895
Relevant Lines:	226105

---

💛 - Coveralls