Closed AAMike closed 7 years ago
@AAMike This merge requests conflicts with the current code, see here -
https://github.com/creativecommons/termination-of-transfer/pull/92/conflicts
Let me know how you would like this resolved.
Thanks, Rob. Here's how it should look:
// Following Copyright Office guidance, works copyrighted before 1940 may
also be eligible for termination under 304d
else if (Values.cright_year < 1940) {
Rules.addFlag('F.ii');
Does that make sense?
On Fri, Apr 28, 2017 at 10:48 AM, Rob Myers notifications@github.com wrote:
@AAMike https://github.com/AAMike This merge requests conflicts with the current code, see here -
https://github.com/creativecommons/termination- of-transfer/pull/92/conflicts
Let me know how you would like this resolved.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/creativecommons/termination-of-transfer/pull/92#issuecomment-298063363, or mute the thread https://github.com/notifications/unsubscribe-auth/APtKWJIqL8U9rZbqtIXuws1aafXxYWGZks5r0iaBgaJpZM4NLi-c .
-- Michael Wolfe
Please note that, as of 2/1/2017, I am no longer at Authors Alliance. You can reach the new Authors Alliance ED, Brianna Schofield, at brianna@authorsalliance.org brianna@authorsalliance.org.
http://authorsalliance.org | 510.480.8302 | @Auths_Alliance
Before I merge this to master, can you check that I've got the sense of the function correct here in the merge-conflict resolved version?
Looks good to me!
On Fri, Apr 28, 2017 at 11:59 AM, Rob Myers notifications@github.com wrote:
Before I merge this to master, can you check that I've got the sense of the function correct here in the merge-conflict resolved version?
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/creativecommons/termination-of-transfer/pull/92#issuecomment-298080333, or mute the thread https://github.com/notifications/unsubscribe-auth/APtKWJHt7L7az0cVrSN-zxxIDn74sHtHks5r0jcsgaJpZM4NLi-c .
-- Michael Wolfe
Please note that, as of 2/1/2017, I am no longer at Authors Alliance. You can reach the new Authors Alliance ED, Brianna Schofield, at brianna@authorsalliance.org brianna@authorsalliance.org.
http://authorsalliance.org | 510.480.8302 | @Auths_Alliance
What's the status of this request?
Playing with the tool confirms these haven't been rolled out (304(d) not being triggered in 1938-39 as was the goal). Do you need anything further from me to resolve any conflicts?
Thank you for the reminder! This has now been merged and has been deployed to labs.