From c381d4f366d16d98d19ef9a4b74e8fafe2301401 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:37:24 +0100
Subject: [PATCH] Remove idl parser from .repos file (#4535)

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
(cherry picked from commit 128d2387872f8a1d4a65d697761c09d56345ccec)

# Conflicts:
#	fastrtps.repos
---
 fastrtps.repos | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fastrtps.repos b/fastrtps.repos
index 88781745dfc..8b7df5c0cb4 100644
--- a/fastrtps.repos
+++ b/fastrtps.repos
@@ -14,8 +14,12 @@ repositories:
     fastddsgen:
         type: git
         url: https://github.com/eProsima/Fast-DDS-Gen.git
+<<<<<<< HEAD
         version: v2.1.2
     fastddsgen/thirdparty/idl-parser:
         type: git
         url: https://github.com/eProsima/IDL-Parser.git
         version: v1.2.0
+=======
+        version: master
+>>>>>>> 128d23878 (Remove idl parser from .repos file (#4535))