merge

2017-05-09 18:54:15 +03:00
parent 5f77b45281 efff71f46e
commit 7536e26d28
1 changed files with 4 additions and 0 deletions
--- a/artists.go
+++ b/artists.go
@@ -34,7 +34,11 @@ type Artist struct {
 	Members        []Member `json:"members"`
 }

+<<<<<<< HEAD
 // ArtistReleases ...
+=======
+// Artistreleases ...
+>>>>>>> efff71f46e36d0fd1868f4abe3efd8c82e32386f
 type ArtistReleases struct {
 	Paginastion Page            `json:"pagination"`
 	Releases    []ReleaseSource `json:"releases"`