Skip to content

Commit 901b010

Browse files
nickshangnickshang
committed
add conflict
1 parent c69a1ea commit 901b010

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

‎index.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
1
22
2
33
devbranch
4+
econfict
5+
master_conflict
6+
featuer_confict

0 commit comments

Comments
 (0)