From 87f5b20e5dc728a0d69b6b68491e6bfef979a754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= <goneri@lebouder.net>
Date: Wed, 21 Sep 2022 20:06:07 -0400
Subject: [PATCH] Revert "amazon.aws: temporarily use the merge strategy"

This reverts commit 5e360167e15deed752887fd7158d640f53564c08.
---
 zuul.d/projects.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 25f6807..55ade6f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -48,7 +48,7 @@
 - project:
     name: ansible-collections/amazon.aws
     default-branch: main
-    merge-mode: merge
+    merge-mode: squash-merge
     templates:
       - system-required
       - publish-to-galaxy