Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtwhite79 committed Feb 25, 2021
2 parents bf24eb8 + 5b2f33d commit 0ba1b50
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
Binary file not shown.
2 changes: 1 addition & 1 deletion src/libs/common/config_os.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define CONFIG_OS_H_


#define PESTPP_VERSION "5.0.10";
#define PESTPP_VERSION "5.0.11";

#if defined(_WIN32) || defined(_WIN64)
#define OS_WIN
Expand Down
1 change: 1 addition & 0 deletions src/libs/pestpp_common/Ensemble.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,7 @@ pair<map<string,int>, map<string, int>> Ensemble::prepare_csv(const vector<strin
}
}
//skip the index label
real_names.clear();
for (int i = 1; i < header_tokens.size(); i++)
{
header_info[header_tokens[i]] = i;
Expand Down

0 comments on commit 0ba1b50

Please sign in to comment.