File tree Expand file tree Collapse file tree 3 files changed +0
-12
lines changed Expand file tree Collapse file tree 3 files changed +0
-12
lines changed Original file line number Diff line number Diff line change 10748
10748
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
10749
10749
},
10750
10750
"track-breadth": {
10751
- <<<<<<< HEAD
10752
10751
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
10756
10752
},
10757
10753
"track-list": {
10758
10754
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"
Original file line number Diff line number Diff line change @@ -10747,11 +10747,7 @@ var syntaxes = {
10747
10747
syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
10748
10748
},
10749
10749
"track-breadth": {
10750
- <<<<<<< HEAD
10751
10750
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
10755
10751
},
10756
10752
"track-list": {
10757
10753
syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"
Original file line number Diff line number Diff line change @@ -3340,11 +3340,7 @@ var syntaxes = {
3340
3340
syntax : "cover | contain | entry | exit | entry-crossing | exit-crossing"
3341
3341
} ,
3342
3342
"track-breadth" : {
3343
- << < << << HEAD
3344
3343
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
- >>> > >>> 061074209 f760d5b1b976e09c82ddefc43772d1e
3348
3344
} ,
3349
3345
"track-list" : {
3350
3346
syntax : "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"
You can’t perform that action at this time.
0 commit comments