chore: resolve conflicts

cosmos · Jun 22, 2023 · eef73b8 · eef73b8
1 parent 8cfd867
commit eef73b8
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml
@@ -23,15 +23,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-<<<<<<< HEAD
-          go-version: "1.19" # The Go version to download (if necessary) and use.
-      # - name: Proto Check
-      #   run: make proto-check
-=======
           go-version: "1.20" # The Go version to download (if necessary) and use.
       - name: Proto Check
         run: make proto-check
->>>>>>> acc494f (fix: re-enable make proto-check and update proto options (#1060))
       - name: Unit, integration and difference tests
         run: go test ./...
       - name: E2E tests