From e10fd7ea59d937431603811b45684c28d9559788 Mon Sep 17 00:00:00 2001
From: l0r1s <contact@lorismoulin.com>
Date: Fri, 16 Jun 2023 17:15:23 +0100
Subject: [PATCH] chore: fix conflicts remainings
---
crates/configuration/src/global_settings.rs | 2 --
1 file changed, 2 deletions(-)
diff --git a/crates/configuration/src/global_settings.rs b/crates/configuration/src/global_settings.rs
index 9f5c503..27fb993 100644
--- a/crates/configuration/src/global_settings.rs
+++ b/crates/configuration/src/global_settings.rs
@@ -26,7 +26,6 @@ pub struct GlobalSettings {
/// Local IP used to expose local services (including RPC, metrics and monitoring).
local_ip: Option<IpAddr>,
- local_ip: Option<IpAddr>,
}
impl GlobalSettings {
@@ -42,7 +41,6 @@ impl GlobalSettings {
self.node_spawn_timeout
}
- pub fn local_ip(&self) -> Option<&IpAddr> {
pub fn local_ip(&self) -> Option<&IpAddr> {
self.local_ip.as_ref()
}
--
GitLab