Skip to content

Commit c64efc3

Browse files
committed
Fix README.md bad merge
1 parent ed42f5d commit c64efc3

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

README.md

-12
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,6 @@ Ran 6 tests in 96.224s
146146
OK
147147
```
148148

149-
<<<<<<< HEAD
150-
## Dependencies
151-
152-
- [imageio](https://imageio.readthedocs.io/en/stable/index.html) 2.8.0
153-
- [numpy](https://numpy.org/) 1.18.1
154-
- [pyresample](https://pyresample.readthedocs.io/en/latest/) 1.14.0
155-
- [python](https://www.python.org/) 3.8
156-
157-
Later versions of the above are presumed to work (but have not been tested).
158-
159-
=======
160-
>>>>>>> c53836965395beafa5a5881aaeb35c9d5251a550
161149
## Potential Improvements
162150

163151
1. Improve usage message (add default option values, improve option argument labels, etc).

0 commit comments

Comments
 (0)