Commit baa8a138 authored by chrisryancombs's avatar chrisryancombs
Browse files

Resolved JigsawSetupDialog merge conflicts

parent da7b097e

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ namespace Isis { 
    // initializations for observation solve settings tab



    createObservationSolveSettingsTreeView();

    m_ui->spkSolveDegreeSpinBox_2->setValue(-1);

    m_ui->spkSolveDegreeSpinBox->setValue(-1);



    QStringList tableHeaders;

    tableHeaders << "coefficients" << "a priori sigma" << "units";