Closed chbrandt closed 5 years ago
@mgangloff could you check this conflict, please? On my command-line git says it is in the file Mars-Global-Surveyor-plasma-data-compared-with-models.md: apparently some different images were used in draft and master.
Mars-Global-Surveyor-plasma-data-compared-with-models.md
draft
master
The conflict can be solved here, from GitHub
@mgangloff Thanks!
@mgangloff could you check this conflict, please? On my command-line git says it is in the file
Mars-Global-Surveyor-plasma-data-compared-with-models.md
: apparently some different images were used indraft
andmaster
.