Skip to content

Commit 1f7b9b1

Browse files
nickshangnickshang
committed
fix conflict
2 parents 901b010 + ea9b265 commit 1f7b9b1

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

‎index.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
1
22
2
33
devbranch
4+
<<<<<<< HEAD
45
econfict
56
master_conflict
67
featuer_confict
8+
=======
9+
ture_feature_confict
10+
>>>>>>> feature

0 commit comments

Comments
 (0)