Skip to content

Conversation

@brianpchsu
Copy link

Change copyright year from 2014 to 2015 in react.js, ReactDOMIframe.js, and setTextContent.js. All changes are in comments and won't affect original codes.

@syranide
Copy link
Contributor

Two of the licenses are even the wrong/old ones (brought in by my pre-2015 PRs :S). Could you update those to use the BSD-license as well?

@brianpchsu
Copy link
Author

Sure. I updated those two files as well.

@brianpchsu
Copy link
Author

I updated the last line of those two file. Are those the format you want? Or I should just delete the last line if it's not really necessary to be there?

@syranide
Copy link
Contributor

Only the license should be updated, any @-directives must be left as-is.

@brianpchsu
Copy link
Author

Hi Andreas, I changed the file's last line (@- directives) to the origin state.

@zpao
Copy link
Member

zpao commented Feb 13, 2015

Can you rebase? This doesn't merge cleanly (I fixed the license on 1 of the files yesterday as part of #3133).

…o the commit to commit #3133 and update the year to 2015.

Conflicts:
	src/browser/ui/dom/setTextContent.js
@brianpchsu
Copy link
Author

Hi Paul, I rebased to the newer commit and update the copyright year to that file as well. Thanks.

@brianpchsu
Copy link
Author

I found my commit combined all the previous version of commit. I'm fixing it now.

@brianpchsu
Copy link
Author

Sorry I did something stupid in rebase. I made another pull request
#3139
and will close this one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants