chore: resolve conflicts

nestjs · Mar 17, 2023 · 907969d · 907969d
2 parents 89fa3d7 + 0c13f1d
commit 907969d
Show file tree

Hide file tree

Showing 4 changed files with 194 additions and 2,319 deletions.
diff --git a/lib/compiler/workspace-utils.ts b/lib/compiler/workspace-utils.ts
@@ -1,4 +1,4 @@
-import * as rimraf from 'rimraf';
+import rimraf from 'rimraf';
 import { Configuration } from '../configuration';
 import { getValueOrDefault } from './helpers/get-value-or-default';
 

diff --git a/lib/schematics/custom.collection.ts b/lib/schematics/custom.collection.ts
@@ -1,4 +1,3 @@
-import { description } from 'commander';
 import { readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { AbstractCollection } from './abstract.collection';