Commit 38b28de1 authored by Philip Carns's avatar Philip Carns
Browse files

fix merge goof

parent dd8e0049
......@@ -71,8 +71,6 @@ characterization data
* will produce \*.pdf files with an analysis summary.
* You can copy these to your laptop using scp to view them.
<<<<<<< HEAD
## Parallel-NetCDF
You can install Parallel-NetCDF on your laptop easily enough, or you can use
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment