From eef73b873f1738877efbb27fc97bd02f9df4a816 Mon Sep 17 00:00:00 2001 From: MSalopek Date: Thu, 22 Jun 2023 16:03:31 +0200 Subject: [PATCH] chore: resolve conflicts --- .github/workflows/automated-tests.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/automated-tests.yml b/.github/workflows/automated-tests.yml index 4b9ac523ed..d48b8ef817 100644 --- 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