Commit c45cb95f authored by acpaquette's avatar acpaquette Committed by amystamile-usgs
Browse files

Post rebase fixes

parent ee21e4b1

isis/src/core/src/PvlKeyword.cpp

+0 −5
Original line number Diff line number Diff line
@@ -222,11 +222,6 @@ namespace Isis { 
        m_units->resize(m_values.size());

      }



<<<<<<< HEAD:isis/src/base/objs/PvlKeyword/PvlKeyword.cpp

=======

      //ASSERT(i < (int) m_units->size());



>>>>>>> fc0563741 (Initial move to core):isis/src/core/PvlKeyword/PvlKeyword.cpp

      (*m_units)[i] = units;

    }

    else {

isis/src/core/tests/unitTests/FileName/FileName.truth

+2 −2
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ Testing Numerical-Only Versioning 
		New version changed FileName: 1



	Testing Versioning Methods [??tttt]

		Highest Version Name:          		Highest Version Failed:     **ERROR** No existing files found with a numerial version matching [??tttt] in [.].

		Highest Version Name:          		Highest Version Failed:     **ERROR** No existing files found with a numerical version matching [??tttt] in [.].

		New Version Name:              01tttt

		New Version Orig:              ./01tttt

		New Version Orig Path:         .
@@ -610,7 +610,7 @@ Testing Numerical-Only Versioning 
		New version changed FileName: 1



	Testing Versioning Methods [junk?]

		Highest Version Name:          		Highest Version Failed:     **ERROR** No existing files found with a numerial version matching [junk?] in [.].

		Highest Version Name:          		Highest Version Failed:     **ERROR** No existing files found with a numerical version matching [junk?] in [.].

		New Version Name:              junk1

		New Version Orig:              ./junk1

		New Version Orig Path:         .