Skip to content

Commit

Permalink
Fix language in README.md in merge-conflict kata
Browse files Browse the repository at this point in the history
  • Loading branch information
@JKrag
Per-Anders Lundblad authored and JKrag committed May 19, 2022
1 parent 0493be1 commit c84e68e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion merge-conflict/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

## The task

In this kata git cannot figure how to merge the content added on `merge-conflict-branch1` with the content on `master`.
In this kata git cannot figure out how to merge the content added on `merge-conflict-branch1` with the content on `master`.

Both changes need to be in master when you're done.

Expand Down

0 comments on commit c84e68e

Please sign in to comment.