From b6abbc3c01310b12ed0a654176084b54e47cb582 Mon Sep 17 00:00:00 2001
From: VAmuzing <amuzik95@gmail.com>
Date: Fri, 22 Dec 2023 05:05:42 +0300
Subject: [PATCH] [fix] remove merge conflicts

Signed-off-by: VAmuzing <amuzik95@gmail.com>
---
 Cargo.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1ff201d4026..463503bae8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3247,9 +3247,10 @@ dependencies = [
 name = "iroha_torii_macro"
 version = "2.0.0-pre-rc.20"
 dependencies = [
+ "manyhow",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.41",
  "warp",
 ]