Skip to content
Snippets Groups Projects
Commit 3bb4aacb authored by Taya Snijder's avatar Taya Snijder
Browse files

merge error

parent 1fbc6bc2
No related branches found
No related tags found
1 merge request!457Resolve L2SS-825 "Start an observation"
Hide whitespace changes
Inline Side-by-side
tangostationcontrol/requirements.txt
+ 0
− 4
View file @ 3bb4aacb
......@@ -3,11 +3,7 @@
# integration process, which may cause wedges in the gate later.
importlib-metadata<2.0.0,>=0.12;python_version<"3.8"
<<<<<<< HEAD
lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.9.2
=======
lofar-station-client@git+https://git.astron.nl/lofar2.0/lofar-station-client@0.9.1
>>>>>>> 9bda21fff53cf2fd9c95e97d415516c0b55628e6
numpy
mock
asyncua >= 0.9.90 # LGPLv3
......
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