Update rolling-binary-build-win.yml

Author: christophfroehlich

.github/workflows/rolling-binary-build-win.yml

@@ -4,19 +4,6 @@ name: Rolling Windows Binary Build
 
 on:
   workflow_dispatch:
-<<<<<<< HEAD
-  pull_request:
-    branches:
-      - master
-    # types:
-    #   - labeled
-  push:
-    branches:
-      - master
-  # issue_comment:
-  #   types:
-  #     - created
-=======
   pull_request: &event
     branches:
       - master
@@ -31,7 +18,6 @@ on:
       - '**/CMakeLists.txt'
       - '**.xml'
   push: *event
->>>>>>> b200644 ([CI] Add paths filters (#427))
 
 concurrency:
   # cancel previous runs of the same workflow, except for pushes on given branches
@@ -40,10 +26,6 @@ concurrency:
 
 jobs:
   binary-windows:
-    # if: |
-    #   (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) ||
-    #   (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) ||
-    #   (github.event_name == 'workflow_dispatch')
     uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
     with:
       ros_distro: rolling