Fix merge error

rust-bio · Jan 27, 2021 · ce729de · ce729de
1 parent ae9aa86
commit ce729de
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -62,7 +62,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-<<<<<<< HEAD
       - uses: actions/cache@v2
         with:
           path: |
@@ -71,8 +70,6 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-=======
->>>>>>> 6321dfc (Switch from Travis to Github Actions)
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
@@ -96,26 +93,19 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-<<<<<<< HEAD
-
+
       - uses: actions/cache@v2
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-=======
->>>>>>> 6321dfc (Switch from Travis to Github Actions)
 
       - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1
         with:
-<<<<<<< HEAD
           toolchain: stable
-=======
-          toolchain: nightly
->>>>>>> 6321dfc (Switch from Travis to Github Actions)
           override: true
 
       - name: Install cargo-tarpaulin