Resolve conflicts and remove empy version

Author: Carlosespicur

.github/workflows/reusable-ci.yml

@@ -45,11 +45,7 @@ jobs:
       - name: Install required python packages
         uses: ./.github/actions/install_python_packages
         with:
-<<<<<<< HEAD
-          packages: "catkin_pkg lark-parser empy colcon-common-extensions"
-=======
           requirements-file: "${{ github.workspace }}/requirements.txt"
->>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
           python-version: ${{ inputs.python-version }}
           use-sudo: "true"
 

README.md

@@ -18,11 +18,7 @@ sudo apt install -y rsync pip git gcc-arm-none-eabi cmake
 This component needs `colcon` and other Python 3 packages in order to build micro-ROS packages:
 
 ```bash
-<<<<<<< HEAD
-pip3 install catkin_pkg lark-parser empy colcon-common-extensions
-=======
 pip3 install -r requirements.txt
->>>>>>> 0ca6886 (Add requirements.txt file for Python dependencies (#40))
 ```
 
 ## Usage

requirements.txt

@@ -1,4 +1,4 @@
 catkin_pkg
 lark-parser
-empy==3.3.4
+empy
 colcon-common-extensions