Commit cd6113b5 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

bugs from fixing merge conflicts

parent 13ea3ef7

isis/src/control/objs/BundleUtilities/BundleControlPoint.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ namespace Isis { 
   *                           formatAprioriSigmaString, and formatBundleOutputDetailString to

   *                           accept a third argument (bool solveRadius) with a default value =

   *                           false.  References #4317.

   */

   *   @history 2017-07-26 Debbie A. Cook - Added BundleSettings and metersToRadians as arguments 

   *                           to constructor and moved setWeights call from BundleAdjust::init into 

   *                           constructor.   Added m_bundleControlPointCoordinateType.  This option