Tortoise Merge 颜色 冲突解决

Left from：

    default:
        if ( strEventID == "ID_ITEM_STROKE_SMOOTH") {
            emit signalPenStatusNotify(2);
        }
        else if (strEventID == "ID_ITEM_DELETE_PIXEL" ) {
            emit signalPenStatusNotify(3);
        }
        else
        {
            qDebug() << __FUNCTION__ <<  "not need event:" << strEventID;
        }
        break;

Right（ mert to )

    default:
    {
        if (strEventID == "ID_ITEM_STROKE_SMOOTH") {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_PEN);
        }
        if (strEventID == "ID_ITEM_DELETE_PIXEL" ) {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_ERASER);
        }
        if (strEventID == "ID_ITEM_STROKE_SELECT" ) {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_COMMON);
        }
    }
        qDebug() << __FUNCTION__ <<  "not need event:" << strEventID;
        break;

合并内容

    default:
<<<<<<< HEAD
    {
        if (strEventID == "ID_ITEM_STROKE_SMOOTH") {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_PEN);
        }
        if (strEventID == "ID_ITEM_DELETE_PIXEL" ) {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_ERASER);
        }
        if (strEventID == "ID_ITEM_STROKE_SELECT" ) {
            emit signalPenStatusNotify(ePenActType::ID_PEN_ACT_COMMON);
=======
        if ( strEventID == "ID_ITEM_STROKE_SMOOTH") {
            emit signalPenStatusNotify(2);
        }
        else if (strEventID == "ID_ITEM_DELETE_PIXEL" ) {
            emit signalPenStatusNotify(3);
>>>>>>> master
        }
        else
        {
            qDebug() << __FUNCTION__ <<  "not need event:" << strEventID;
        }
        break;