From 1eb12153625061167d763f435fdca3fc707ec909 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Wed, 18 Oct 2023 22:50:24 +0100
Subject: [PATCH] .

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

diff --git a/.drone.yml b/.drone.yml
index 4b9bc9e..e64677d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,9 +20,9 @@ steps:
     - git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
     - git checkout -b master
     - git pull origin master
-    #- git branch -D product-development
+    # - git branch -D product-development
     - git checkout -b product-development
-    - merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
+    - git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD