From 9e4239e02ca001e3a3b6d2b7846472c0c9af80b9 Mon Sep 17 00:00:00 2001
From: Reinder Kraaij <kraaij@astron.nl>
Date: Wed, 16 Apr 2025 17:57:52 +0000
Subject: [PATCH] temporary clear merge conflict

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index f596a833c..f48ba0328 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,6 @@ Next change the version in the following places:
    through [https://git.astron.nl/lofar2.0/tango/-/tags](Deploy Tags)
 
 # Release Notes
-* 0.48.2 rename antennafield_id
 * 0.48.1 Fix exposing correct triangle of XSTs in gRPC service
 * 0.48.0 Add Antennafield to gRPC server
 * 0.47.2 Fix ZMQ hostname to subscribe to in gRPC server
-- 
GitLab