Remove leftover merge conflict

trufflesuite · Nov 11, 2020 · f02e6c0 · f02e6c0
1 parent 5d87fff
commit f02e6c0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/packages/db/src/loaders/resources/compilations/index.ts b/packages/db/src/loaders/resources/compilations/index.ts
@@ -5,12 +5,7 @@ import { toIdObject, IdObject } from "@truffle/db/meta";
 import {
   CompilationData,
   LoadedSources,
-<<<<<<< HEAD
   Load
-=======
-  WorkspaceRequest,
-  WorkspaceResponse
->>>>>>> Remove unneeded imports, variable
 } from "@truffle/db/loaders/types";
 
 import { AddCompilations } from "./add.graphql";