Skip to content
Snippets Groups Projects
Select Git revision
  • 90b5fa5b3fd3e09fb6ec9600a99ad6f3278b5ecc
  • master default protected
  • L2SS-2199-apply-dab-to-xy
  • refactor-control-power-properties
  • update-lcu-rollout-procedure
  • stop-using-mesh-gateway
  • test-pytango-10.0.3
  • deploy-components-parallel
  • L2SS-2407-swap-iers-caltable-monitoring-port
  • L2SS-2357-fix-ruff
  • sync-up-with-meta-pypcc
  • stabilise-landing-page
  • all-stations-lofar2
  • v0.39.7-backports
  • Move-sdptr-to-v1.5.0
  • fix-build-ubuntu
  • tokens-in-env-files
  • fix-build
  • L2SS-2214-deploy-cdb
  • fix-missing-init
  • add-power-hardware-apply
  • v0.52.9 protected
  • v0.52.8 protected
  • v0.52.7 protected
  • v0.55.5-r2 protected
  • v0.52.8-rc1 protected
  • v0.55.5 protected
  • v0.55.4 protected
  • 0.55.2.dev0
  • 0.55.1.dev0
  • 0.55.0.dev0
  • v0.54.0 protected
  • 0.53.2.dev0
  • 0.53.1.dev0
  • v0.52.3-r2 protected
  • remove-snmp-client
  • v0.52.3 protected
  • v0.52.3dev0 protected
  • 0.53.1dev0
  • v0.52.2-rc3 protected
  • v0.52.2-rc2 protected
41 results

tango

  • Clone with SSH
  • Clone with HTTPS
    • user avatar
    Task #9893: merge trunk into this branch.
    Alexander van Amesfoort authored 
    Fix merge conflict on momqueryservice.py. Moved on trunk, but changed on this branch.
Solve by replacing the moved file with the changed file (thus, move the changed file over the moved file).
Careful checking of (JD's) changes shows this is correct; the changes are preserved.
Other moved files did not cause conflicts, since they were not changed.
    03b2a810
    History
    user avatar 03b2a810
    History
    Name Last commit Last update