From 5205c3353525c1f9644f4b1bb926bc35d739874c Mon Sep 17 00:00:00 2001 From: zinduolis Date: Wed, 6 Nov 2024 14:41:57 +1000 Subject: [PATCH] Resolving merge conflicts --- .github/workflows/github_actions.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index f0c01959c..bb01686b9 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -41,8 +41,12 @@ jobs: - name: 'Setting up Ruby' uses: ruby/setup-ruby@v1 +<<<<<<< HEAD with: ruby-version: 3.0.3 # Not needed with a .ruby-version file +======= + # Ruby version is defined in .ruby-version file +>>>>>>> 5bd0752d (Resolving merge conflicts) - name: 'Update and Install Dependencies' run: |