From b184f033ab448faf8d553e4d4a5522feb4018c80 Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Fri, 31 May 2019 18:02:55 +0200 Subject: [PATCH] merge conflicts --- sources/youtubeVideo.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/youtubeVideo.go b/sources/youtubeVideo.go index d78ddf0..3f5d1d4 100644 --- a/sources/youtubeVideo.go +++ b/sources/youtubeVideo.go @@ -326,7 +326,7 @@ func (v *YoutubeVideo) publish(daemon *jsonrpc.Client, claimAddress string, amou Tags: tags, Locations: locations, }, - License: util.PtrToString("Copyrighted (contact author)"), + License: util.PtrToString("Copyrighted (contact publisher)"), ReleaseTime: util.PtrToInt64(v.publishedAt.Unix()), ChannelID: &v.lbryChannelID, } @@ -485,7 +485,7 @@ func (v *YoutubeVideo) reprocess(daemon *jsonrpc.Client, params SyncParams, exis ThumbnailURL: &thumbnailURL, }, Author: util.PtrToString(""), - License: util.PtrToString("Copyrighted (contact author)"), + License: util.PtrToString("Copyrighted (contact publisher)"), ReleaseTime: util.PtrToInt64(v.publishedAt.Unix()), Duration: util.PtrToUint64(uint64(math.Ceil(videoDuration.ToDuration().Seconds()))), ChannelID: &v.lbryChannelID,