Unverified Commit a48af9a9 authored by Summer Stapleton's avatar Summer Stapleton Committed by GitHub
Browse files

Merge pull request #419 from AgoinsUSGS/merge_fix 

Fixed bad conflict fix
parents 51876792 451bbbd2

isis/src/control/apps/cnetcombinept/cnetcombinept.cpp

+0 −3
Original line number Diff line number Diff line
@@ -135,9 +135,6 @@ void IsisMain() { 
    if ( description.isEmpty() ) {

      description = cnet->Description();

    }

    if ( radii.isEmpty() )  {

      radii = QVector<Distance>::fromStdVector(cnet->GetTargetRadii());

    }



    // Now get list of all cube serials and add all to list

    QList<QString> serials = cnet->GetCubeSerials();