From abb1a48e8c85054eb671d991c325d70315220d95 Mon Sep 17 00:00:00 2001
From: Pranshu Chittora <pranshuchittora17@gmail.com>
Date: Tue, 4 Jun 2019 22:10:51 +0530
Subject: [PATCH] chore(interfaces): minor modifications based on reviews

fixed few things based on the review
---
 packages/utils/scaffold.ts     | 2 +-
 packages/utils/types/Config.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/utils/scaffold.ts b/packages/utils/scaffold.ts
index e00c933aca5..6075c2ed19e 100644
--- a/packages/utils/scaffold.ts
+++ b/packages/utils/scaffold.ts
@@ -5,7 +5,7 @@ import * as path from "path";
 import { findProjectRoot } from "./path-utils";
 
 import { Error } from "./types";
-import { Config, TransformConfig } from "./modify-config-helper";
+import { Config, TransformConfig } from "./types/Config";
 import propTypes from "./prop-types";
 import astTransform from "./recursive-parser";
 import runPrettier from "./run-prettier";
diff --git a/packages/utils/types/Config.ts b/packages/utils/types/Config.ts
index dd696f59053..73077a2d92b 100644
--- a/packages/utils/types/Config.ts
+++ b/packages/utils/types/Config.ts
@@ -4,7 +4,7 @@ export interface Config extends Object {
 	};
 	topScope?: string[];
 	configName?: string;
-	merge: object;
+	merge: string | string[];
 	webpackOptions: object;
 }