Fix committed merge conflict

Author: Benjamin-Philip

.github/workflows/erlang-ci.yml

@@ -122,47 +122,3 @@ jobs:
 
       - name: Run dialyzer
         run: rebar3 dialyzer
-<<<<<<< HEAD
-
-  docbuild_test:
-    name: Test Generate the Docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v7.0.0
-
-      - name: Cache Rust crates
-        uses: actions/cache@v6
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-          key: test-native-${{ runner.os }}-${{ env.RUST_TOOLCHAIN_VERSION }}-${{ hashFiles('native/**/Cargo.lock') }}
-          restore-keys: |
-            test-native-${{ runner.os }}-${{ env.RUST_TOOLCHAIN_VERSION }}
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # v1
-        with:
-          toolchain: "${{ env.RUST_TOOLCHAIN_VERSION }}"
-
-      - name: Install Erlang/OTP
-        uses: erlef/setup-beam@fc68ffb90438ef2936bbb3251622353b3dcb2f93 # v1.24.0
-        with:
-          otp-version: 25.1.0
-          rebar3-version: '3.18.0'
-
-      - name: Cache Hex packages
-        uses: actions/cache@v6
-        with:
-          path: ~/.cache/rebar3/hex/hexpm/packages
-          key: ${{ runner.os }}-hex-${{ hashFiles(format('{0}{1}', github.workspace, '/rebar.lock')) }}
-          restore-keys: |
-            ${{ runner.os }}-hex-
-
-      - name: Generate Docs
-        run: rebar3 ex_doc
-=======
->>>>>>> 3f77acb (Publish docs to arrow.apache.org)