Resolved merge conflicts

michaelolof · michaelolof · commit dc86e757ce58 · 2019-09-01T21:18:39.000+01:00
diff --git a/src/module.ts b/src/module.ts
@@ -261,7 +261,7 @@ function extractModulesFromPrototype( cls :VuexModuleConstructor ) {
 }
 
 function extractDecoratorGetterNames( names :string[] ) {
-  const decorator = {};
+  const decorator :Map = {};
   for( let name of names ) {
     decorator[ name ] = new Function("state", `return state.${name}`);
   }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ function extractModulesFromPrototype( cls :VuexModuleConstructor ) {`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`function extractDecoratorGetterNames( names :string[] ) {`
`264`		`- const decorator = {};`
	`264`	`+ const decorator :Map = {};`
`265`	`265`	`for( let name of names ) {`
`266`	`266`	decorator[ name ] = new Function("state", `return state.${name}`);
`267`	`267`	`}`