From 7dd6b71226c760793cbb1ff2383f9b5b1fc20c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@lebouder.net>
Date: Fri, 25 Jun 2021 10:38:15 -0400
Subject: [PATCH] amazon.aws: temp turn on the merge strategy

Disable the `squash-merge` merge strategy just the time we land

- https://github.com/ansible-collections/amazon.aws/pull/435
- https://github.com/ansible-collections/amazon.aws/pull/410
---
 zuul.d/projects.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 063d6122..750df1eb 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -9,7 +9,6 @@
 - project:
     name: github.com/ansible-collections/amazon.aws
     default-branch: main
-    merge-mode: squash-merge
     templates:
       - system-required
       - publish-to-galaxy