From c3a586a73d826a77ee3bdae74af9614ef41eb8fc Mon Sep 17 00:00:00 2001
From: Aleksandr Bochev <aleksandr.bochev@zalando.de>
Date: Sun, 2 Oct 2022 10:02:57 +0200
Subject: [PATCH] fixed merge

---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index aefa811..99fa537 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -549,7 +549,7 @@ impl TransClient {
     /// # Panics
     /// Either metainfo or torrent filename must be set or this call will panic.
     ///
-    pub async fn torrent_add(&mut self, add: TorrentAddArgs) -> Result<RpcResponse<TorrentAdded>> {
+    pub async fn torrent_add(&mut self, add: TorrentAddArgs) -> Result<RpcResponse<TorrentAddedOrDuplicate>> {
         assert!(
             !(add.metainfo == None && add.filename == None),
             "Metainfo or Filename should be provided"