From 2420c32540fd4ce936363bfff50bee7a72479acb Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Tue, 15 Oct 2024 03:34:01 +0300
Subject: [PATCH] 	modified:   Cargo.toml

---
 Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5ad3aaf..e532234 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,6 @@ x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] }
 base64 = "0.22.1"
 chrono = "0.4.38"
 console-subscriber = "0.4.0"
-<<<<<<< HEAD
 network-interface = "2.0.0"
 
 [target.'cfg(target_os="android")'.dependencies]
@@ -46,6 +45,3 @@ jni = "^0.20"
 robusta_jni = "0.2.2"
 nonblock = "0.2.0"
 log4rs = "1.3.0"
-=======
-network-interface = "2.0.0"
->>>>>>> 35594dea3ce13c2fe98f3a7bdd28e9b3c8351732