fixed bad merge

Author: machinekoder

qml/BBIOConfig.qml

@@ -243,12 +243,8 @@ Rectangle {
             currentColorMap: selector.currentColorMap
             loadedOverlays: overlaySelector.output
             previewType: legend.previewType
-<<<<<<< HEAD
-            previewEnabled: legend.previewEnabled
-=======
             previewOverlay: overlaySelector.hoveredItem
             previewEnabled: (legend.previewType != "") || (overlaySelector.hoveredItem != "")
->>>>>>> adf09281281a5175cf4009aa763ec3f41b1f5e19
             configMode: configModeSelector.currentIndex
             portNumber: 8
             displayUneditablePins: displayUneditablePinsCheck.checked

qml/Pin.qml

@@ -155,8 +155,6 @@ Item {
     width: 100
     height: 62
 
-<<<<<<< HEAD
-=======
     Timer {
         property color previewColor: "white"
         property bool x: true
@@ -167,7 +165,6 @@ Item {
         onTriggered: x = !x
     }
 
->>>>>>> adf09281281a5175cf4009aa763ec3f41b1f5e19
     ToolTip {
         anchors.left: rightSide?parent.right:undefined
         anchors.leftMargin: parent.width*0.8