Commit 26a283e8 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

merged changes

parent ffc22a8a

isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp

+0 −3
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ namespace Isis { 
  QSize ControlPointEditView::sizeHint() const {

    return QSize(800, 600);

  }

<<<<<<< HEAD

=======





  /**
@@ -131,5 +129,4 @@ namespace Isis { 
  QList<QAction *> ControlPointEditView::toolPadActions() {

    return m_toolPad->actions();

  }

>>>>>>> 1001bc94a06dc2dc3a66150daac19cd5356ced42

}