Remove idl parser from .repos file (#4535)

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> (cherry picked from commit 128d238) # Conflicts: # fastrtps.repos
eProsima · Mar 9, 2024 · c381d4f · c381d4f
1 parent c293fa8
commit c381d4f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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))