deploying- Merge pull request '.' (#55 ) from product-development into master

Reviewed-on: #55
Merge pull request '.' (#55 ) from product-development into master
2023-10-18 23:16:13 +00:00 · 2023-10-18 23:16:05 +00:00 · 2023-10-19 00:14:57 +01:00
5 changed files with 4 additions and 2212 deletions
--- 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 format-branch
-    #- git merge --squash --no-commit --strategy-option=theirs format-branch
+    - git merge --squash --no-commit --strategy-option=theirs format-branch
  environment:
    GIT_PASSWORD:
      from_secret: GIT_PASSWORD
--- a/equipment-model.a.yml
+++ b/equipment-model.a.yml
--- a/equipment-model.axml
+++ b/equipment-model.axml
--- a/instructions/equipment-model2.a.yml
+++ b/instructions/equipment-model2.a.yml
--- a/instructions/equipment-model2.axml
+++ b/instructions/equipment-model2.axml
Author	SHA1	Message	Date
giles	f484ad72b1	deploying- Merge pull request '.' (#55 ) from product-development into master Reviewed-on: #55	2023-10-18 23:16:13 +00:00
giles	cf1e55363c	Merge pull request '.' (#55 ) from product-development into master continuous-integration/drone/push Build is passing Details Reviewed-on: #55	2023-10-18 23:16:05 +00:00
giles	a163eec687	. continuous-integration/drone/push Build is passing Details	2023-10-19 00:14:57 +01:00