Skip to content

Commit 4881672

Browse files
xgqfrmsxgqfrms
committed
Update git-merge-conflict.md
1 parent f2b896a commit 4881672

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎git-merge-conflict.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# git merge
22

3-
<!-- todo -->
3+
merge conflicts

0 commit comments

Comments
 (0)