resolve conflict

.github/workflows/changelogs.yml

@@ -25,38 +25,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-<<<<<<< HEAD
-      - name: Set PATH
-        # https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#adding-a-system-path
-        run: |
-          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cabal/store
-          key: linux-store-changelogs
-      # See https://github.com/haskell/cabal/pull/8739
-      - name: Sudo chmod to permit ghcup to update its cache
-        run: |
-          if [[ "${{ runner.os }}" == "Linux" ]]; then
-            sudo mkdir -p /usr/local/.ghcup/cache
-            sudo chown -R $USER /usr/local/.ghcup
-            sudo chmod -R 777 /usr/local/.ghcup
-          fi
-      - name: ghcup
-        run: |
-          ghcup config set cache true
-          ghcup install ghc recommended
-          ghcup set ghc recommended
-      - name: Update Hackage index
-        run: cabal v2-update
-      # Cannot install it from tarball due to
-      # https://github.com/haskell/cabal/issues/7360
-      - uses: actions/checkout@v4
-        with:
-          repository: "fgaz/changelog-d"
-          path: "changelog-d"
-      - name: Install changelog-d
-=======
 
       # Cannot install changelog-d directly from remote tarball due to
       # https://github.com/haskell/cabal/issues/7360
@@ -73,7 +41,6 @@ jobs:
 
       - name: Build plan for changelog-d
         working-directory: changelog-d
->>>>>>> af5d60613 (CI changelogs: switch to XDG, fix cache key)
         run: |
           cabal v2-build --dry-run --allow-newer=changelog-d:base