Skip to content

Commit a74085e

Browse files
committed
fix comment #92
1 parent d0eba17 commit a74085e

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

dist/index-umd-web.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10748,11 +10748,7 @@
1074810748
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
1074910749
},
1075010750
"track-breadth": {
10751-
<<<<<<< HEAD
1075210751
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
1075610752
},
1075710753
"track-list": {
1075810754
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/index.cjs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10747,11 +10747,7 @@ var syntaxes = {
1074710747
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
1074810748
},
1074910749
"track-breadth": {
10750-
<<<<<<< HEAD
1075110750
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
1075510751
},
1075610752
"track-list": {
1075710753
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/lib/validation/config.json.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3340,11 +3340,7 @@ var syntaxes = {
33403340
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
33413341
},
33423342
"track-breadth": {
3343-
<<<<<<< HEAD
33443343
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
33483344
},
33493345
"track-list": {
33503346
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

0 commit comments

Comments
 (0)