epn-vespa / tutorials

VESPA tutorials
3 stars 7 forks source link

Draft #16

Closed chbrandt closed 5 years ago

chbrandt commented 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.

chbrandt commented 5 years ago

The conflict can be solved here, from GitHub

chbrandt commented 5 years ago

@mgangloff Thanks!