mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-09-22 08:50:13 +02:00
92d706f677
See https://github.com/mermaid-js/mermaid/pull/5974 There were a lot of merge conflicts! Conflicts: packages/mermaid/src/rendering-util/rendering-elements/shapes/bowTieRect.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/card.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/cylinder.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/filledCircle.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/flippedTriangle.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/hourglass.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/imageSquare.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/lightningBolt.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/linedCylinder.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/shadedProcess.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/stateStart.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedRect.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedWaveEdgedRectangle.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/triangle.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts packages/mermaid/src/rendering-util/rendering-elements/shapes/windowPane.ts