From f642c23bd45d673b0461ecd764908cf0d8c7d789 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Mon, 2 Dec 2024 13:43:24 +0000 Subject: [PATCH 1/2] Commit with unresolved merge conflicts outside of submodules --- default.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/default.json b/default.json index 2256ba670f6..d65902c3619 100644 --- a/default.json +++ b/default.json @@ -6,7 +6,13 @@ "logging_enabled": false, "application_is_private_build": false, "development_api_enabled": false, +<<<<<<< HEAD "analytics_enabled": false, +======= + "mls_support_enabled": false, + "analytics_enabled": true, + "encrypt_proteus_storage": true, +>>>>>>> 9c81e2c61 (chore: enable cc proteus [WPB-14658] (#3682)) "analytics_app_key": "4483f7a58ae3e70b3780319c4ccb5c88a037be49", "analytics_server_url": "https://countly.wire.com/" }, From 7cf5ee99d296e3ccb30198d972b609521b913f30 Mon Sep 17 00:00:00 2001 From: Mohamad Jaara Date: Wed, 4 Dec 2024 15:01:33 +0100 Subject: [PATCH 2/2] Update default.json --- default.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/default.json b/default.json index d65902c3619..88f263eabbb 100644 --- a/default.json +++ b/default.json @@ -6,13 +6,8 @@ "logging_enabled": false, "application_is_private_build": false, "development_api_enabled": false, -<<<<<<< HEAD "analytics_enabled": false, -======= - "mls_support_enabled": false, - "analytics_enabled": true, "encrypt_proteus_storage": true, ->>>>>>> 9c81e2c61 (chore: enable cc proteus [WPB-14658] (#3682)) "analytics_app_key": "4483f7a58ae3e70b3780319c4ccb5c88a037be49", "analytics_server_url": "https://countly.wire.com/" },