Skip to content
Snippets Groups Projects
Commit 4f7e79db authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-358-add-apscu-apsct' of...

Merge branch 'L2SS-358-add-apscu-apsct' of https://git.astron.nl/lofar2.0/tango into L2SS-358-add-apscu-apsct

Conflicts:
	CDB/recv-sim-config.json
	CDB/stations/LTS_ConfigDb.json
	CDB/unb2-sim-config.json
	devices/clients/opcua_client.py
	devices/devices/apsct.py
	devices/devices/apspu.py
	devices/devices/opcua_device.py
	devices/devices/recv.py
	devices/devices/unb2.py
parents c45aea00 88edd6fd
No related branches found
No related tags found
1 merge request!157L2SS-358: Get ready for Darkrai
Showing
with 620 additions and 411 deletions
Loading
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