cleanup merge conflicts

Signed-off-by: shmck <[email protected]>

Author: ShMcK

src/build.ts

@@ -1,3 +1,4 @@
+import * as yamlParser from "js-yaml";
 import * as path from "path";
 import * as _ from "lodash";
 import * as fs from "fs";

src/create.ts

@@ -1,4 +1,4 @@
-import * as ncp from "ncp";
+import ncp from "ncp";
 import * as path from "path";
 import { promisify } from "util";
 

src/utils/validate.ts

@@ -5,13 +5,14 @@ import schema from "./schema";
 // @ts-ignore ajv typings not working
 import JsonSchema from "ajv";
 
-export function validateSchema(json: T.Tutorial) {
+export function validateSchema(json: any) {
   // validate using https://json-schema.org/
   const jsonSchema = new JsonSchema({ allErrors: true, verbose: true });
   // support draft-07 of json schema
   jsonSchema.addMetaSchema(require("ajv/lib/refs/json-schema-draft-07.json"));
 
-  const valid = jsonSchema.compile(schema, json);
+  const validator = jsonSchema.compile(schema);
+  const valid = validator(json);
 
   if (!valid) {
     // log errors