Commitb2af5f9

committed

cleanup merge conflicts

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent25ac1a3 commitb2af5f9Copy full SHA for b2af5f9

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import*asyamlParserfrom"js-yaml";`
`1`	`2`	`import*aspathfrom"path";`
`2`	`3`	`import*as_from"lodash";`
`3`	`4`	`import*asfsfrom"fs";`

Lines changed: 1 addition & 1 deletion

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,14 @@ import schema from "./schema";`
`5`	`5`	`//@ts-ignore ajv typings not working`
`6`	`6`	`importJsonSchemafrom"ajv";`
`7`	`7`
`8`		`-exportfunctionvalidateSchema(json:T.Tutorial){`
	`8`	`+exportfunctionvalidateSchema(json:any){`
`9`	`9`	`// validate using https://json-schema.org/`
`10`	`10`	`constjsonSchema=newJsonSchema({allErrors:true,verbose:true});`
`11`	`11`	`// support draft-07 of json schema`
`12`	`12`	`jsonSchema.addMetaSchema(require("ajv/lib/refs/json-schema-draft-07.json"));`
`13`	`13`
`14`		`-constvalid=jsonSchema.compile(schema,json);`
	`14`	`+constvalidator=jsonSchema.compile(schema);`
	`15`	`+constvalid=validator(json);`
`15`	`16`
`16`	`17`	`if(!valid){`
`17`	`18`	`// log errors`

Comments

(0)