rebase
This commit is contained in:
3
LICENSE
3
LICENSE
@@ -175,6 +175,7 @@
|
|||||||
of your accepting any such warranty or additional liability.
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
END OF TERMS AND CONDITIONS
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
@@ -201,3 +202,5 @@
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> 58fd1d240c01295d9dfbdb285b97757dc7f89ed1
|
||||||
|
|||||||
Reference in New Issue
Block a user