Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-09-19 23:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing merge conflict

Browse Source
This commit is contained in:
Kai Renken 2023-10-01 23:39:53 +02:00
parent c6da80c598
commit 301a0ba5ec
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
veilid-cli/src/ui.rs
View File

@ -477,11 +477,7 @@ impl UI {
let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap(); let color = *Self::inner_mut(s).log_colors.get(&Level::Warn).unwrap();
cursive_flexi_logger_view::parse_lines_to_log( cursive_flexi_logger_view::parse_lines_to_log(
color.into(), color.into(),
<<<<<<< HEAD format!(">> {} Could not copy to clipboard", UI::cli_ts(Self::get_start_time()))
format!(">> {} Could not copy to clipboard", UI::cli_ts(Self::get_start_time())),
=======
">> Could not copy to clipboard".to_string(),
>>>>>>> f59c4509ea7e0c0e8b1088138a6eb5297844b112
); );
} }
} else { } else {
@ -497,7 +493,6 @@ impl UI {
.is_ok() .is_ok()
&& std::io::stdout().flush().is_ok() && std::io::stdout().flush().is_ok()
{ {
<<<<<<< HEAD
if std::io::stdout().flush().is_ok() { if std::io::stdout().flush().is_ok() {
let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap(); let color = *Self::inner_mut(s).log_colors.get(&Level::Info).unwrap();
cursive_flexi_logger_view::parse_lines_to_log( 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()), 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
} }
} }
} }

2
veilid-server/src/settings.rs
View File

@ -49,7 +49,7 @@ core:
disable: [] disable: []
protected_store: protected_store:
allow_insecure_fallback: true allow_insecure_fallback: true
always_use_insecure_storage: false always_use_insecure_storage: true
directory: '%DIRECTORY%' directory: '%DIRECTORY%'
delete: false delete: false
device_encryption_key_password: '%DEVICE_ENCRYPTION_KEY_PASSWORD%' device_encryption_key_password: '%DEVICE_ENCRYPTION_KEY_PASSWORD%'