fix rebase

terrastruct · Nov 8, 2024 · e9986e2 · e9986e2
1 parent a8bf438
commit e9986e2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
@@ -1334,7 +1334,7 @@ func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape
 			// we need the self closing form in this svg/xhtml context
 			render = strings.ReplaceAll(render, "<hr>", "<hr />")
 
-			mdEl := d2themes.NewThemableElement("div")
+			mdEl := d2themes.NewThemableElement("div", inlineTheme)
 			mdEl.ClassName = "md"
 			mdEl.Content = render
 

diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt
@@ -279,8 +279,6 @@ a <-> c: {style.animated: true}
 a <-> d: {style.animated: true}
 a <-> e
 f <-> g: {style.animated: true}
-<<<<<<< HEAD:e2etests/txtar.txt
-x -- x: {style.animated: true}
 
 -- sequence-edge-group-tall-edge-label --
 Sequence: {