From cf47f1a6cb6c8e22d215262a0b19c0afcd0b5d59 Mon Sep 17 00:00:00 2001
From: Christoph Dornieden <cdor@informatik.uni-kiel.de>
Date: Thu, 23 Jun 2016 18:32:44 +0200
Subject: [PATCH] merge

---
 app/components/architecture-viewer.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/components/architecture-viewer.js b/app/components/architecture-viewer.js
index 61e9d6c..8648937 100644
--- a/app/components/architecture-viewer.js
+++ b/app/components/architecture-viewer.js
@@ -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',
-- 
GitLab