fix

sequencer · Apr 1, 2022 · 0ef1d57 · 0ef1d57
1 parent cb2caed
commit 0ef1d57
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/build.sc b/build.sc
@@ -39,7 +39,6 @@ class arithmetic extends ScalaModule with ScalafmtModule with PublishModule { m
   override def scalacPluginIvyDeps = Agg(v.chisel3Plugin)
 
   override def ivyDeps = super.ivyDeps() ++ Agg(
-<<<<<<< HEAD
     v.chisel3,
     v.chiseltest,
     v.upickle,