fix(ui): resolved rebase conflicts

influxdata · Dec 23, 2019 · 8a7cd82 · 8a7cd82
1 parent 9f8ebdf
commit 8a7cd82
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/ui/src/telegrafs/components/CollectorCard.tsx b/ui/src/telegrafs/components/CollectorCard.tsx
@@ -133,21 +133,13 @@ class CollectorRow extends PureComponent<Props & WithRouterProps> {
   }
 
   private handleAddLabel = async (label: Label) => {
-<<<<<<< HEAD
-    const {collector, onAddLabels} = this.props
-=======
     const {collector, onAddLabel} = this.props
->>>>>>> feat(ui): completed feature
 
     await onAddLabel(collector.id, label)
   }
 
   private handleRemoveLabel = async (label: Label) => {
-<<<<<<< HEAD
-    const {collector, onRemoveLabels} = this.props
-=======
     const {collector, onRemoveLabel} = this.props
->>>>>>> feat(ui): completed feature
 
     await onRemoveLabel(collector.id, label)
   }