Skip to content

Commit 39957cc

Browse files
authored
Merge pull request #18 from weeyin83/day13
day 13 update
2 parents 2dd8744 + 818f7e8 commit 39957cc

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ This repository is my journey learning Git and getting familiar with more comman
1919
- [X] 10 🦹‍ > [Merging](https://www.techielass.com/merging-with-git/)
2020
- [X] 11 🦹‍ > [Rebasing](https://www.techielass.com/git-rebasing/)
2121
- [X] 12 🦹‍ > [Stashing](https://www.techielass.com/git-stashing/)
22-
- [ ] 13 🦹‍ > Conflicts
22+
- [X] 13 🦹‍ > [Conflicts](https://www.techielass.com/git-conflicts)
2323
- [ ] 14 🦹‍ > Subtrees and Submodules

0 commit comments

Comments
 (0)