Commit 5f3ce896 authored by Amir MOHAMMADI's avatar Amir MOHAMMADI

avoid conflicts

parent 9c4f68a3
......@@ -70,9 +70,9 @@ zip_keys:
# The dependencies that we link against (host requirements).
ffmpeg:
- 4.2
- 4.2.2
freetype:
- 2.10
- 2.10.4
glib:
- 2.63.1
harfbuzz:
......@@ -82,16 +82,16 @@ hdf5:
jasper:
- 2.0.14
jpeg:
- 9
- 9b
libpng:
- 1.6
- 1.6.37
libtiff:
- 4.1
- 4.1.0
mkl:
- 2019
- 2019.4
numpy:
- 1.16
xz:
- 5
- 5.2.5
zlib:
- 1.2
- 1.2.11
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