From 5b15ed6f15bef2df6e55f5288bf53d71bd7a61c2 Mon Sep 17 00:00:00 2001
From: Fouad <fmtabbara@hotmail.co.uk>
Date: Wed, 21 Dec 2022 12:56:40 +0000
Subject: [PATCH] merge resolve

---
 nym-wallet/Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock
index 4821268ecd..25e16a69a1 100644
--- a/nym-wallet/Cargo.lock
+++ b/nym-wallet/Cargo.lock
@@ -2876,7 +2876,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.1.3"
+version = "1.1.5"
 dependencies = [
  "aes-gcm",
  "argon2 0.3.4",