Skip to content

Commit

Permalink
Merge branch 'develop' into DestinE
Browse files Browse the repository at this point in the history
  • Loading branch information
danovaro committed Jan 9, 2024
2 parents 2cfe587 + 96b6e9f commit c1eb83b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.0
1.11.1
2 changes: 1 addition & 1 deletion tests/marsgen/metkit_marsgen_obs.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -uex

[ -e outfile.simple ] && rm outfile.simple
[ -e outfile.obs ] && rm outfile.obs

MARSGEN="@CMAKE_BINARY_DIR@/bin/mars-archive-script"
GENFILE="@CMAKE_CURRENT_SOURCE_DIR@/genfile"
Expand Down

0 comments on commit c1eb83b

Please sign in to comment.