fix comment #92

Author: tbela99

dist/index-umd-web.js

@@ -10748,11 +10748,7 @@
     		syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
     	},
     	"track-breadth": {
-<<<<<<< HEAD
     		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
-=======
-    		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
->>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
     	},
     	"track-list": {
     		syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/index.cjs

@@ -10747,11 +10747,7 @@ var syntaxes = {
 		syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
 	},
 	"track-breadth": {
-<<<<<<< HEAD
 		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
-=======
-		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
->>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
 	},
 	"track-list": {
 		syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"

dist/lib/validation/config.json.js

@@ -3340,11 +3340,7 @@ var syntaxes = {
 		syntax: "cover | contain | entry | exit | entry-crossing | exit-crossing"
 	},
 	"track-breadth": {
-<<<<<<< HEAD
 		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>"
-=======
-		syntax: "<length-percentage> | <flex> | min-content | max-content | auto | <-non-standard-size>>"
->>>>>>> 061074209f760d5b1b976e09c82ddefc43772d1e
 	},
 	"track-list": {
 		syntax: "[ <line-names>? [ <track-size> | <track-repeat> ] ]+ <line-names>?"