Skip to content

Commit d0eba17

Browse files
committed
fix comment #92
2 parents 8c38b43 + 0610742 commit d0eba17

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

dist/index-umd-web.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10748,7 +10748,11 @@
1074810748
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
1074910749
},
1075010750
"track-breadth": {
10751+
<<<<<<< HEAD
1075110752
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
10753+
=======
10754+
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
10755+
>>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
1075210756
},
1075310757
"track-list": {
1075410758
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/index.cjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10747,7 +10747,11 @@ var syntaxes = {
1074710747
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
1074810748
},
1074910749
"track-breadth": {
10750+
<<<<<<< HEAD
1075010751
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
10752+
=======
10753+
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
10754+
>>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
1075110755
},
1075210756
"track-list": {
1075310757
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/lib/validation/config.json.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3340,7 +3340,11 @@ var syntaxes = {
33403340
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
33413341
},
33423342
"track-breadth": {
3343+
<<<<<<< HEAD
33433344
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
3345+
=======
3346+
syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
3347+
>>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
33443348
},
33453349
"track-list": {
33463350
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

0 commit comments

Comments
 (0)