Skip to content

Commit 7fb06c5

Browse files
committed
fix: 修复 merge 冲突
1 parent 8496827 commit 7fb06c5

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

examples/more-plots/sunburst/demo/meta.json

-33
Original file line numberDiff line numberDiff line change
@@ -18,95 +18,62 @@
1818
"zh": "自定义 hierarchy field",
1919
"en": "Custom hierarchy field of value"
2020
},
21-
<<<<<<< Updated upstream
22-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/yBxQkbPBXF/2a71c7de-1971-4651-bcba-dd18ddd8732e.png"
23-
=======
24-
<<<<<<< Updated upstream
25-
"screenshot": "https://gw.alipayobjects.com/mdn/rms_d314dd/afts/img/A*VXhvSYH8YowAAAAAAAAAAAAAARQnAQ"
26-
=======
2721
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/yBxQkbPBXF/2a71c7de-1971-4651-bcba-dd18ddd8732e.png",
2822
"new": true
29-
>>>>>>> Stashed changes
3023
},
3124
{
3225
"filename": "label.ts",
3326
"title": {
3427
"zh": "设置标签布局",
3528
"en": "Set label layout"
3629
},
37-
<<<<<<< Updated upstream
38-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/nUWhQ3lWeT/ab0dd09f-f735-41ab-bb13-f38e3354ed62.png"
39-
=======
4030
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/nUWhQ3lWeT/ab0dd09f-f735-41ab-bb13-f38e3354ed62.png",
4131
"new": true
42-
>>>>>>> Stashed changes
4332
},
4433
{
4534
"filename": "color-field.ts",
4635
"title": {
4736
"zh": "自定义颜色通道",
4837
"en": "Color of sunburst plot"
4938
},
50-
<<<<<<< Updated upstream
51-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/DCwOWeZD5T/cbbbe84d-a0ff-4602-ab3e-22429e6a1719.png"
52-
}, {
53-
=======
5439
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/DCwOWeZD5T/cbbbe84d-a0ff-4602-ab3e-22429e6a1719.png",
5540
"new": true
5641
},
5742
{
58-
>>>>>>> Stashed changes
5943
"filename": "color.ts",
6044
"title": {
6145
"zh": "自定义旭日图颜色",
6246
"en": "Color of sunburst plot"
6347
},
64-
<<<<<<< Updated upstream
65-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/IvLI4di5ww/7faf7005-44f2-4832-bbca-227b039f4260.png"
66-
=======
6748
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/IvLI4di5ww/7faf7005-44f2-4832-bbca-227b039f4260.png",
6849
"new": true
69-
>>>>>>> Stashed changes
7050
},
7151
{
7252
"filename": "style.ts",
7353
"title": {
7454
"zh": "自定义旭日图样式",
7555
"en": "Style of sunburst plot"
7656
},
77-
<<<<<<< Updated upstream
78-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/aAO3F8JuLP/83d5b6fe-e789-4395-a48b-6992259eb872.png"
79-
=======
8057
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/aAO3F8JuLP/83d5b6fe-e789-4395-a48b-6992259eb872.png",
8158
"new": true
82-
>>>>>>> Stashed changes
8359
},
8460
{
8561
"filename": "tooltip-fields.ts",
8662
"title": {
8763
"zh": "自定义 Tooltip fields",
8864
"en": "Custom tooltip fields"
8965
},
90-
<<<<<<< Updated upstream
91-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/IGdW4zjTce/e515a753-d3a2-49d7-90e0-89786501db82.png"
92-
=======
9366
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/IGdW4zjTce/e515a753-d3a2-49d7-90e0-89786501db82.png",
9467
"new": true
95-
>>>>>>> Stashed changes
9668
},
9769
{
9870
"filename": "custom-tooltip-items.ts",
9971
"title": {
10072
"zh": "自定义 Tooltip items",
10173
"en": "Custom tooltip items"
10274
},
103-
<<<<<<< Updated upstream
104-
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/yBxQkbPBXF/2a71c7de-1971-4651-bcba-dd18ddd8732e.png"
105-
=======
10675
"screenshot": "https://gw.alipayobjects.com/zos/antfincdn/yBxQkbPBXF/2a71c7de-1971-4651-bcba-dd18ddd8732e.png",
10776
"new": true
108-
>>>>>>> Stashed changes
109-
>>>>>>> Stashed changes
11077
}
11178
]
11279
}

0 commit comments

Comments
 (0)