From d477ee4e436607e615fca1fa2873f42ee2b81b64 Mon Sep 17 00:00:00 2001
From: Zandario <zandarioh@gmail.com>
Date: Sat, 19 Nov 2022 21:34:02 -0600
Subject: [PATCH] Change the merge conflict timeout time (#4733)

Just tgstation/tgstation/pull/59252
To steal their description
> Fetching mergable is async because idk github and bigger repos take
longer to do it so this should fix timeout issues somewhat
We don't have that issue but idk
---
 .github/workflows/conflicts.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
index 95ac68f967f..cfc332b3097 100644
--- a/.github/workflows/conflicts.yml
+++ b/.github/workflows/conflicts.yml
@@ -11,3 +11,4 @@ jobs:
         with:
           CONFLICT_LABEL_NAME: 'Merge Conflict'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WAIT_MS: 10000