From a6f1407a2d9930a472fbde47535f6e561c4fe47c Mon Sep 17 00:00:00 2001
From: akuma06 <demon.akuma06@gmail.com>
Date: Tue, 1 Aug 2017 14:04:29 +0200
Subject: [PATCH] Forgot this conflict

---
 models/torrent.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/models/torrent.go b/models/torrent.go
index a4991ded..347d8d25 100644
--- a/models/torrent.go
+++ b/models/torrent.go
@@ -98,11 +98,7 @@ type TorrentJSON struct {
 	Completed    uint32        `json:"completed"`
 	LastScrape   time.Time     `json:"last_scrape"`
 	FileList     []FileJSON    `json:"file_list"`
-<<<<<<< HEAD
 	Tags         Tags          `json:"-"` // not needed in json to reduce db calls
-=======
-	Tags         Tags           `json:"-"` // not needed in json to reduce db calls
->>>>>>> 7508bc24f19bdc381654f009ba98b5ad225f2317
 }
 
 // Size : Returns the total size of memory recursively allocated for this struct