Skip to content

Commit

Permalink
Update content.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@martyn-w
martyn-w committed Dec 17, 2024
1 parent f944610 commit c1fe921
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions docs/content.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,3 +899,4 @@ Simple merge conflicts can be resolved in the Github text editor by preserving t
* [Resolving a merge conflict on GitHub](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github)
Complex merge conflicts will need to be resolved via the git commandline and will require developer assistance.

0 comments on commit c1fe921

Please sign in to comment.