Skip to content

Conversation

@brianpchsu
Copy link

I did something stupid in rebase and need to redo pull request. Sorry about this. I changed react.js licence to BSD-license and update the year in that, ReactDOMIframe.js, and setTextContent.js to 2015. Thanks.

@brianpchsu
Copy link
Author

It was originally in this thread.
#3135

@zpao
Copy link
Member

zpao commented Feb 13, 2015

Thanks!

zpao added a commit that referenced this pull request Feb 13, 2015
Fixed Copyright year for three files and react.js licence to BSD-license
@zpao zpao merged commit 3751f85 into facebook:master Feb 13, 2015
@syranide
Copy link
Contributor

@brianpchsu Looks good, for future reference; if you mess up a branch, you can always reset it to master and start from fresh in the same branch.

@brianpchsu
Copy link
Author

Thanks. I will keep that in mind!!

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