From 6a5e9d0a6b1ede0c426b1af4a6d74e8eb07d1893 Mon Sep 17 00:00:00 2001
From: irlndts <kleto4kin@gmail.com>
Date: Wed, 10 May 2017 18:02:10 +0300
Subject: [PATCH] fix

---
 artists.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/artists.go b/artists.go
index d5d9800..0323d55 100644
--- a/artists.go
+++ b/artists.go
@@ -34,11 +34,7 @@ type Artist struct {
 	Members        []Member `json:"members"`
 }
 
-<<<<<<< HEAD
 // ArtistReleases ...
-=======
-// Artistreleases ...
->>>>>>> efff71f46e36d0fd1868f4abe3efd8c82e32386f
 type ArtistReleases struct {
 	Paginastion Page            `json:"pagination"`
 	Releases    []ReleaseSource `json:"releases"`