From 301a0ba5ec7da22cd793f18d1cc53255cffa5cca Mon Sep 17 00:00:00 2001
From: Kai Renken <code@koffeinsucht.de>
Date: Sun, 1 Oct 2023 23:39:53 +0200
Subject: [PATCH] fixing merge conflict

---
 veilid-cli/src/ui.rs          | 14 +-------------
 veilid-server/src/settings.rs |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/veilid-cli/src/ui.rs b/veilid-cli/src/ui.rs
index 42828b14..13e6126d 100644
--- a/veilid-cli/src/ui.rs
+++ b/veilid-cli/src/ui.rs
@@ -477,11 +477,7 @@ impl UI {
                 let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap();
                 cursive_flexi_logger_view::parse_lines_to_log(
                     color.into(),
-<<<<<<< HEAD
-                    format!(">> {} Could not copy to clipboard",  UI::cli_ts(Self::get_start_time())),
-=======
-                    ">> Could not copy to clipboard".to_string(),
->>>>>>> f59c4509ea7e0c0e8b1088138a6eb5297844b112
+                    format!(">> {} Could not copy to clipboard",  UI::cli_ts(Self::get_start_time()))
                 );
             }
         } else {
@@ -497,7 +493,6 @@ impl UI {
                 .is_ok()
                 && std::io::stdout().flush().is_ok()
             {
-<<<<<<< HEAD
                 if std::io::stdout().flush().is_ok() {
                     let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
                     cursive_flexi_logger_view::parse_lines_to_log(
@@ -505,13 +500,6 @@ impl UI {
                         format!(">> {} Copied: {}", UI::cli_ts(Self::get_start_time()), text.as_ref()),
                     );
                 }
-=======
-                let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
-                cursive_flexi_logger_view::parse_lines_to_log(
-                    color.into(),
-                    format!(">> Copied: {}", text.as_ref()),
-                );
->>>>>>> f59c4509ea7e0c0e8b1088138a6eb5297844b112
             }
         }
     }
diff --git a/veilid-server/src/settings.rs b/veilid-server/src/settings.rs
index 23b9de80..abc73335 100644
--- a/veilid-server/src/settings.rs
+++ b/veilid-server/src/settings.rs
@@ -49,7 +49,7 @@ core:
         disable: []
     protected_store:
         allow_insecure_fallback: true
-        always_use_insecure_storage: false
+        always_use_insecure_storage: true
         directory: '%DIRECTORY%'
         delete: false
         device_encryption_key_password: '%DEVICE_ENCRYPTION_KEY_PASSWORD%'