From 44dc1781a5911e8893e50864eea4244ca256742f Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 17 Oct 2023 17:34:53 +0200 Subject: [PATCH] Fix deployment on dev branch (#2834) The deployment on dev channel should always be development. The change came in from the main branch backmerge where the wrong merge strategy has been used (the merge strategy "ort" along with option "ours" has been used, instead of the "ours" merge strategy). And since the deployment was a separate hunk, it resolved to the release branch. --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 987e1f0e3..4b4c54102 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -5,4 +5,4 @@ VERSION_SUFFIX="dev0" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="production" +DEPLOYMENT="development"