Loading isis/src/base/objs/Preference/Preference.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -115,7 +115,7 @@ namespace Isis { // If its a unitTest then load with the unitTest preference file if(unitTest) { p_preference->Load("$ISISROOT/TestPreferences"); p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences"); } // Otherwise load the Isis system and personal preferences. else { Loading @@ -134,7 +134,7 @@ namespace Isis { else if(unitTest) { p_unitTest = unitTest; p_preference->clear(); p_preference->Load("$ISISROOT/TestPreferences"); p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences"); } return *p_preference; Loading Loading
isis/src/base/objs/Preference/Preference.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -115,7 +115,7 @@ namespace Isis { // If its a unitTest then load with the unitTest preference file if(unitTest) { p_preference->Load("$ISISROOT/TestPreferences"); p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences"); } // Otherwise load the Isis system and personal preferences. else { Loading @@ -134,7 +134,7 @@ namespace Isis { else if(unitTest) { p_unitTest = unitTest; p_preference->clear(); p_preference->Load("$ISISROOT/TestPreferences"); p_preference->Load("$ISISROOT/src/base/objs/Preference/TestPreferences"); } return *p_preference; Loading