Skip to content
Snippets Groups Projects
Commit 9e4239e0 authored by Reinder Kraaij's avatar Reinder Kraaij :eye:
Browse files

temporary clear merge conflict

parent c6ed61ef
Branches
Tags
No related merge requests found
Pipeline #114618 canceled
Stage: prepare
Stage: lint
Stage: test
Stage: package
Stage: images
Stage: integration
Stage: deploy
Pipeline: tango

#114619

    Show whitespace changes
    Inline Side-by-side
    Showing
    with 0 additions and 1 deletion
    README.md
    + 0
    − 1
    View file @ 9e4239e0
    ...@@ -150,7 +150,6 @@ Next change the version in the following places: ...@@ -150,7 +150,6 @@ Next change the version in the following places:
    through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags) through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags)
    # Release Notes # Release Notes
    * 0.48.2 rename antennafield_id
    * 0.48.1 Fix exposing correct triangle of XSTs in gRPC service * 0.48.1 Fix exposing correct triangle of XSTs in gRPC service
    * 0.48.0 Add Antennafield to gRPC server * 0.48.0 Add Antennafield to gRPC server
    * 0.47.2 Fix ZMQ hostname to subscribe to in gRPC server * 0.47.2 Fix ZMQ hostname to subscribe to in gRPC server
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment