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
......@@ -10,10 +10,7 @@ export default Ember.Component.extend({
layoutAlgorithms: [
'cose-bilkent',
'cose',
<<<<<<< HEAD
// 'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18
=======
>>>>>>> da62a369c3eb11a12b3b712bdb1628f3f87bf94a
'cola',
'grid',
'concentric',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment