Skip to content
Snippets Groups Projects
Commit cf47f1a6 authored by Christoph Dornieden's avatar Christoph Dornieden
Browse files

merge

parent d568c3ba
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/components/architecture-viewer.js
+ 0
− 3
View file @ cf47f1a6
...@@ -10,10 +10,7 @@ export default Ember.Component.extend({ ...@@ -10,10 +10,7 @@ export default Ember.Component.extend({
layoutAlgorithms: [ layoutAlgorithms: [
'cose-bilkent', 'cose-bilkent',
'cose', 'cose',
<<<<<<< HEAD
// 'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18 // 'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18
=======
>>>>>>> da62a369c3eb11a12b3b712bdb1628f3f87bf94a
'cola', 'cola',
'grid', 'grid',
'concentric', 'concentric',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment