Fix conflicts

Signed-off-by: Javier Gil Aviles <javiergil@eprosima.com>
eProsima · Feb 3, 2025 · 7d9b19f · 7d9b19f
1 parent 227776a
commit 7d9b19f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/tools/fastdds/discovery/parser.py b/tools/fastdds/discovery/parser.py
@@ -54,16 +54,13 @@ def __init__(self, argv):
                     (len(argv) == 1 and argv[0] == '--help')
                ):
                 print(self.__edit_tool_help(result.stdout))
-<<<<<<< HEAD
-=======
             elif (
                 (len(argv) == 1 and argv[0] == '-v') or
                 (len(argv) == 1 and argv[0] == '--version')
                 ):
                 result = subprocess.run([tool_path, '-v'])
                 if result.returncode != 0:
                     sys.exit(result.returncode)
->>>>>>> 2cdc2d96 (Fix Discovery CLI Tool in Windows (#5493))
             else:
                 # Call the tool
                 result = subprocess.run([tool_path] + argv)