From 6c1f128d47d75de1cfda1c6f60d33f02637da898 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Thu, 19 Oct 2023 00:36:34 +0100
Subject: [PATCH] oooo

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

diff --git a/.drone.yml b/.drone.yml
index f84a6fd..2f090ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,8 +23,8 @@ steps:
     # - 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 checkout format-branch **/*.* 
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
+    #- git checkout format-branch **/*.* 
   environment:
     GIT_PASSWORD:
       from_secret: GIT_PASSWORD