diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md index 59a78518407d5f58e5015404978f6589fa9068e3..4acfd37dc2476abf884da389b1374360b5d45f28 100644 --- a/docs/assignments/week01.md +++ b/docs/assignments/week01.md @@ -103,7 +103,7 @@ Yes! I had my first conflicting commit between the remote repository and my loca Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay! -*conflicting commits!* +*conflicts resolved!*