From dc0417075e7ae55f4414309d3d6803f337f38b84 Mon Sep 17 00:00:00 2001 From: HavenDV Date: Mon, 19 Aug 2024 16:22:58 +0400 Subject: [PATCH] ci: Fixed auto-merge. --- .github/workflows/auto-merge.yml | 1 + H.InputSimulator.sln | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index cf3db31..cf5141c 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - main + - master permissions: contents: write diff --git a/H.InputSimulator.sln b/H.InputSimulator.sln index 64433a0..2d92674 100644 --- a/H.InputSimulator.sln +++ b/H.InputSimulator.sln @@ -23,6 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md .github\workflows\pull-request.yml = .github\workflows\pull-request.yml .github\dependabot.yml = .github\dependabot.yml + .github\workflows\auto-merge.yml = .github\workflows\auto-merge.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.InputSimulator.UnitTests", "src\tests\H.InputSimulator.UnitTests\H.InputSimulator.UnitTests.csproj", "{F2548AE2-D736-4C21-942F-55C4F592EFF2}"