From 535674bcaba917462d08cb0516f46faf5479a876 Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Wed, 10 Nov 2021 09:05:17 +0100
Subject: [PATCH 1/2] Temporal disable Rolling Agent CI (#408)

(cherry picked from commit 218170bcf20417c22d03bcbb5300d1312149ec5a)

# Conflicts:
#	.github/workflows/nightly.yml
---
 .github/workflows/nightly.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index aca9862a..9edf535c 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -362,8 +362,15 @@ jobs:
         include:
           - distro: foxy
             branch: foxy
+<<<<<<< HEAD
           - distro: rolling
             branch: main
+=======
+          # - distro: rolling
+          #  branch: main
+          - distro: galactic
+            branch: galactic
+>>>>>>> 218170b (Temporal disable Rolling Agent CI (#408))
 
     needs: micro_ros_build
     container: ros:${{ matrix.distro }}
@@ -399,4 +406,4 @@ jobs:
 
       - name: installation
         run: |
-            (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false
\ No newline at end of file
+            (test -f install/micro_ros_agent/lib/micro_ros_agent/micro_ros_agent) && true || false

From 949d108d6079283de3ae87c06cf718e00b54ed8b Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Wed, 10 Nov 2021 09:14:12 +0100
Subject: [PATCH 2/2] Update nightly.yml

---
 .github/workflows/nightly.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 9edf535c..a9b1dda2 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -362,15 +362,8 @@ jobs:
         include:
           - distro: foxy
             branch: foxy
-<<<<<<< HEAD
-          - distro: rolling
-            branch: main
-=======
           # - distro: rolling
           #  branch: main
-          - distro: galactic
-            branch: galactic
->>>>>>> 218170b (Temporal disable Rolling Agent CI (#408))
 
     needs: micro_ros_build
     container: ros:${{ matrix.distro }}