bugfix

src/app/components/analysis-panel/analysis-panel.component.html

@@ -157,7 +157,6 @@
           <div class="columns m-1"
                *ngIf="['quick','super','connect','connectSelected'].indexOf(task.info.algorithm) > -1"
           >
-<<<<<<< HEAD
             <div class="column">
               <h4 class="is-4 has-text-weight-bold">
               <span class="icon">