From f9051aff76bdf2c3e9a0ebd862db6b7d48df2ca7 Mon Sep 17 00:00:00 2001
From: Keanu <keanutimmermans8@gmail.com>
Date: Fri, 19 Feb 2021 21:47:22 +0100
Subject: [PATCH] Why was this on `rebase` again?

---
 .github/pull.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull.yml b/.github/pull.yml
index a1afdb1..08de30a 100644
--- a/.github/pull.yml
+++ b/.github/pull.yml
@@ -2,5 +2,5 @@ version: '1'
 rules:
   - base: master
     upstream: dmitmel:master
-    mergeMethod: rebase
+    mergeMethod: merge
     mergeUnstable: true