fix

2017-05-10 18:02:10 +03:00 · 2017-05-10 18:02:10 +03:00 · 6a5e9d0a6b
parent 7536e26d28
commit 6a5e9d0a6b
1 changed files with 0 additions and 4 deletions
--- 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"`