Perry Fraser db54aa084f fix: missing paren in link in "Resolving a merge conflict on GitHub"

2021-11-14 21:55:58 -05:00

..

about-merge-conflicts.md

Add the missing closing parenthesis for link

2021-11-08 12:56:46 -08:00

index.md

Merge branch 'main' into jules-4795

2021-10-18 15:11:48 +02:00

resolving-a-merge-conflict-on-github.md

fix: missing paren in link in "Resolving a merge conflict on GitHub"

2021-11-14 21:55:58 -05:00

resolving-a-merge-conflict-using-the-command-line.md

add versioning to new articles

2021-10-18 15:48:05 +02:00