Commit b9b025a9 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fixed merge conflicts.

parent e150d935

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+0 −6
Original line number Diff line number Diff line
@@ -2017,7 +2017,6 @@ namespace Isis { 
    }



    m_leftMeasure = new ControlMeasure;

    //  Find measure for each file    

    *m_leftMeasure = *((*m_editPoint)[serial]);



    //  If m_leftCube is not null, delete before creating new one
@@ -2067,11 +2066,6 @@ namespace Isis { 
    }



    m_rightMeasure = new ControlMeasure;

    //  Find measure for each file

    *m_rightMeasure = *((*m_editPoint)[serial]);



    m_rightMeasure = new ControlMeasure();

    //  Find measure for each file

    *m_rightMeasure = *((*m_editPoint)[serial]);



    //  If m_rightCube is not null, delete before creating new one