chore: actually resolve conflicts

forcedotcom · Oct 12, 2021 · 9532ff3 · 9532ff3
1 parent ef1e6a0
commit 9532ff3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/test/resolve/sourceComponent.test.ts b/test/resolve/sourceComponent.test.ts
@@ -31,11 +31,9 @@ import {
   COMPONENT_1_XML_PATH,
   CHILD_2_NAME,
   COMPONENT_1,
-  COMPONENT_1_XML_PATH,
   MATCHING_RULES_COMPONENT_XML_PATH,
   MATCHING_RULES_TYPE,
   TREE,
-  VIRTUAL_DIR,
 } from '../mock/registry/type-constants/nonDecomposedConstants';
 import { createSandbox } from 'sinon';
 import { join } from 'path';