Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhaoxiang 2018-02-23 00:47:45 +08:00
commit eb211a1a3c

View File

@ -176,7 +176,7 @@ recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within the same "printed page" as the copyright notice for easier identification within
third-party archives. third-party archives.
Copyright 2017 王轶 Copyright 2018 Zhao
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.