.github/renovate.json

@@ -1,20 +0,0 @@
-{
-  "extends": [
-    "config:base"
-  ],
-  "postUpdateOptions": ["gomodTidy"],
-  "packageRules": [
-    {
-      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    },
-    {
-      "groupName": "all deps",
-      "separateMajorMinor": true,
-      "groupSlug": "all",
-      "packagePatterns": [
-        "*"
-      ]
-    }
-  ]
-}

.github/workflows/autoapprove.yml

@@ -13,11 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: approve
-<<<<<<< HEAD
         uses: hmarr/auto-approve-action@v3
-=======
-        uses: hmarr/auto-approve-action@v2
->>>>>>> master
         if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
         id: approve
         with:

.github/workflows/build.yml

@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: setup
-<<<<<<< HEAD
       uses: actions/setup-go@v3
       with:
         go-version: 1.17
@@ -18,15 +17,6 @@ jobs:
       uses: actions/checkout@v3
     - name: cache
       uses: actions/cache@v3
-=======
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v2
->>>>>>> master
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -44,11 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-<<<<<<< HEAD
         uses: golangci/golangci-lint-action@v3.4.0
-=======
-        uses: golangci/golangci-lint-action@v3.1.0
->>>>>>> master
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -45,21 +45,12 @@ jobs:
     - name: checkout
       uses: actions/checkout@v3
     - name: setup
-<<<<<<< HEAD
       uses: actions/setup-go@v3
       with:
         go-version: 1.17
     # Initializes the CodeQL tools for scanning.
     - name: init
       uses: github/codeql-action/init@v2
-=======
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v1
->>>>>>> master
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,11 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: autobuild
-<<<<<<< HEAD
       uses: github/codeql-action/autobuild@v2
-=======
-      uses: github/codeql-action/autobuild@v1
->>>>>>> master
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -88,8 +75,4 @@ jobs:
     #   make release
 
     - name: analyze
-<<<<<<< HEAD
       uses: github/codeql-action/analyze@v2
-=======
-      uses: github/codeql-action/analyze@v1
->>>>>>> master

.github/workflows/dependabot-automerge.yml

@@ -15,11 +15,7 @@ jobs:
     steps:
       - name: metadata
         id: metadata
-<<<<<<< HEAD
         uses: dependabot/fetch-metadata@v1.3.6
-=======
-        uses: dependabot/fetch-metadata@v1.3.0
->>>>>>> master
         with:
           github-token: "${{ secrets.TOKEN }}"
       - name: merge

.github/workflows/pr.yml

@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: setup
-<<<<<<< HEAD
       uses: actions/setup-go@v3
       with:
         go-version: 1.17
@@ -18,15 +17,6 @@ jobs:
       uses: actions/checkout@v3
     - name: cache
       uses: actions/cache@v3
-=======
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v2
->>>>>>> master
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -44,11 +34,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: lint
-<<<<<<< HEAD
         uses: golangci/golangci-lint-action@v3.4.0
-=======
-        uses: golangci/golangci-lint-action@v3.1.0
->>>>>>> master
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.