chore: fix merge conflicts

DimitarTachev · DimitarTachev · commit 4edfd2500abb · 2018-11-05T13:52:45.000+02:00
diff --git a/lib/services/project-templates-service.ts b/lib/services/project-templates-service.ts
@@ -31,7 +31,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 
 		const templateName = constants.RESERVED_TEMPLATE_NAMES[name.toLowerCase()] || name;
 		if (!this.$fs.exists(templateName)) {
-			version = version || await this.$npmInstallationManager.getLatestCompatibleVersion(templateName);
+			version = version || await this.$packageInstallationManager.getLatestCompatibleVersion(templateName);
 		}
 
 		const fullTemplateName = version ? `${templateName}@${version}` : templateName;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {`
`31`	`31`
`32`	`32`	`const templateName = constants.RESERVED_TEMPLATE_NAMES[name.toLowerCase()] \|\| name;`
`33`	`33`	`if (!this.$fs.exists(templateName)) {`
`34`		`- version = version \|\| await this.$npmInstallationManager.getLatestCompatibleVersion(templateName);`
	`34`	`+ version = version \|\| await this.$packageInstallationManager.getLatestCompatibleVersion(templateName);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	const fullTemplateName = version ? `${templateName}@${version}` : templateName;