fixup! Deprecate all Injecting Aspect Code (#4415)

chipsalliance · Sep 27, 2024 · 324278e · 324278e
1 parent 4fc27f5
commit 324278e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -68,16 +68,11 @@ lazy val warningSuppression = Seq(
     // This is deprecated for external users but not internal use
     "cat=deprecation&origin=firrtl\\.options\\.internal\\.WriteableCircuitAnnotation:s",
     "cat=deprecation&origin=chisel3\\.util\\.experimental\\.BoringUtils.*:s",
-<<<<<<< HEAD
-    "cat=deprecation&origin=chisel3\\.ltl.*:s"
-=======
-    "cat=deprecation&origin=chisel3\\.experimental\\.IntrinsicModule:s",
     "cat=deprecation&origin=chisel3\\.ltl.*:s",
     // This is deprecated and planned to be removed
     "cat=deprecation&origin=chisel3\\.aop\\.injecting.*:s",
     "cat=deprecation&origin=chisel3\\.stage\\.phases\\.MaybeInjectingPhase:s",
     "cat=deprecation&origin=chisel3\\.ModuleAspect:s"
->>>>>>> d292a5eef (Deprecate all Injecting Aspect Code (#4415))
   ).mkString(",")
 )