Skip to content

Commit 59f9728

Browse files
committed
resolve CI issues
1 parent f080655 commit 59f9728

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

packages/examples/src/index.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,11 @@ import vennDiagram from './examples/venn.js';
2727
import treeViewDiagram from './examples/tree-view.js';
2828
import wardleyDiagram from './examples/wardley.js';
2929
import cynefinDiagram from './examples/cynefin.js';
30-
<<<<<<< HEAD
3130
import railroadDiagram from './examples/railroad.js';
3231
import railroadEbnfDiagram from './examples/railroad-ebnf.js';
3332
import railroadAbnfDiagram from './examples/railroad-abnf.js';
3433
import railroadPegDiagram from './examples/railroad-peg.js';
35-
=======
3634
import ditaaDiagram from './examples/ditaa.js';
37-
>>>>>>> 49563a814 (resolve CI issues)
3835

3936
export const diagramData: DiagramMetadata[] = [
4037
flowChart,
@@ -65,12 +62,9 @@ export const diagramData: DiagramMetadata[] = [
6562
treeViewDiagram,
6663
wardleyDiagram,
6764
cynefinDiagram,
68-
<<<<<<< HEAD
6965
railroadDiagram,
7066
railroadEbnfDiagram,
7167
railroadAbnfDiagram,
7268
railroadPegDiagram,
73-
=======
7469
ditaaDiagram,
75-
>>>>>>> 49563a814 (resolve CI issues)
7670
];

0 commit comments

Comments
 (0)