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