Skip to content

Commit 975d591

Browse files
committed
fix conflic
1 parent 1f7b9b1 commit 975d591

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

index.html

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
1
22
2
3-
devbranch
4-
<<<<<<< HEAD
5-
econfict
6-
master_conflict
7-
featuer_confict
8-
=======
9-
ture_feature_confict
10-
>>>>>>> feature
3+
devbranch

0 commit comments

Comments
 (0)