Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 28203ca4 by songchangcheng
Options

解决冲突

1 parent 1a0c0a47
Inline Side-by-side
Showing with 1 additions and 3 deletions
public/drawio/js/diagramly/sidebar/Sidebar.js
...@@ -156,10 +156,8 @@ ...@@ -156,10 +156,8 @@
{id: 'fluid_power', libs: ['fluid_power']}, {id: 'fluid_power', libs: ['fluid_power']},
{id: 'gmdl', prefix: 'gmdl', libs: Sidebar.prototype.gmdl}, {id: 'gmdl', prefix: 'gmdl', libs: Sidebar.prototype.gmdl},
// {id: 'archimate4', prefix: 'archimate4', libs: Sidebar.prototype.archimate4}, // {id: 'archimate4', prefix: 'archimate4', libs: Sidebar.prototype.archimate4},
<<<<<<< HEAD
{id: 'archimate_define', prefix: 'archimate_define', libs: Sidebar.prototype.archimate_define}, {id: 'archimate_define', prefix: 'archimate_define', libs: Sidebar.prototype.archimate_define},
=======
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
{id: 'archimate', libs: ['archimate']}, {id: 'archimate', libs: ['archimate']},
{id: 'webicons', libs: ['webicons', 'weblogos']}, {id: 'webicons', libs: ['webicons', 'weblogos']},
{id: 'sysml', prefix: 'sysml', libs: Sidebar.prototype.sysml}]; {id: 'sysml', prefix: 'sysml', libs: Sidebar.prototype.sysml}];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!