fix merge conflict

paritytech · May 1, 2023 · b3f544e · b3f544e
1 parent 972a405
commit b3f544e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/_tasks/dnt.ts b/_tasks/dnt.ts
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-import { config } from "../capi.config.ts"
 import { build, EntryPoint } from "../deps/dnt.ts"
-=======
-import { build } from "../deps/dnt.ts"
->>>>>>> cf8c79f (begin config revamp)
 import * as flags from "../deps/std/flags.ts"
 import * as fs from "../deps/std/fs.ts"
 import * as path from "../deps/std/path.ts"