From a163eec6873ca10b5fe80eb8c1c3807c294be1b6 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Thu, 19 Oct 2023 00:14:57 +0100
Subject: [PATCH] .

---
 .drone.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index df76b5f..5c7253b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -22,8 +22,8 @@ steps:
     - git pull origin master
     # - git branch -D product-development
     - git checkout -b product-development
-    - git merge format-branch
-    #- git merge --squash --no-commit --strategy-option=theirs format-branch
+    #- git merge format-branch
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD