EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 9977cf84 authored by Mussab Abdalla's avatar Mussab Abdalla
Browse files

update from master

parent 0f163464
No related branches found
No related tags found
No related merge requests found
......@@ -75,9 +75,6 @@
],
"data_type": "Uint16",
"name": "RGBNir"
<<<<<<< HEAD
}]
=======
},{
"bands": [
{
......@@ -818,4 +815,3 @@
"data_type": "Float32",
"name": "float32_grayscale"
}]
>>>>>>> master
......@@ -4,10 +4,7 @@ while [ -z $(docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /v
sleep 20
done
<<<<<<< HEAD
while [ -z $(docker exec -i $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py id list) ]; do
>&2 echo "Collection is not created yet - sleeping"
sleep 20
done
=======
>>>>>>> master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment