Merge branch 'activerecord_upgrade_to_7_2' of https://github.com/zinduolis/beef into activerecord_upgrade_to_7_2

.github/workflows/github_actions.yml

@@ -41,12 +41,7 @@ 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: |