fix gh

Author: mqcmd196

.github/workflows/config.yml

@@ -22,12 +22,8 @@ jobs:
             ROS_PARALLEL_TEST_JOBS: "-j8"
             CATKIN_PARALLEL_JOBS: "-i"
             NOT_TEST_INSTALL : true
-<<<<<<< HEAD
             BEFORE_SCRIPT : "sudo pip install packaging==17.1; for name in ffha libsiftfast nlopt julius julius_ros downward assimp_devel google_chat_ros; do echo \\$name; find $GITHUB_WORKSPACE -iname \\$name -exec touch {}/CATKIN_IGNORE \\; ; ls -al \\$(find -iname \\$name)/; done" # Skip large packagses
             USE_DEB: false
-=======
-            BEFORE_SCRIPT : "for name in dialogflow_task_executive ros_speech_recognition sesame_ros ffha libsiftfast nlopt julius julius_ros downward assimp_devel voice_text; do echo \\$name; find $GITHUB_WORKSPACE -iname \\$name -exec touch {}/CATKIN_IGNORE \\; ; ls -al \\$(find -iname \\$name)/; done" # Skip large packagses /  Skip packages that could not build on indigo dialogflow_task_executive/ros_speech_recognition/sesame_ros
->>>>>>> c0450ee3 ([voice_text] Skip indigo test, for requiring cmake>=3. It can be)
           - ROS_DISTRO: kinetic
             CONTAINER: ubuntu:16.04
             ROS_PARALLEL_TEST_JOBS: "-j8"