diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2019-05-08 16:31:46 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2019-05-08 16:31:46 -0700 |
| commit | d358b0fc07188caa4521a04425c9a84021d97d9a (patch) | |
| tree | 58bbf0251e31df642637c3e8c11e8a004ae54016 /com/nhaarman | |
| parent | f8cca029518820d72e77a1595b40761bf78307ad (diff) | |
| parent | edf76f91b87aa6f920c5081c3a69f46343beba62 (diff) | |
| download | external-d358b0fc07188caa4521a04425c9a84021d97d9a.tar.gz | |
resolve merge conflicts of edf76f91b87aa6f920c5081c3a69f46343beba62 to androidx-platform-dev
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I88723239809d399dd3f88da0a7c77303e671797a
Diffstat (limited to 'com/nhaarman')
| -rw-r--r-- | com/nhaarman/mockitokotlin2/mockito-kotlin/2.0.0-RC2/LICENSE | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/com/nhaarman/mockitokotlin2/mockito-kotlin/2.0.0-RC2/LICENSE b/com/nhaarman/mockitokotlin2/mockito-kotlin/2.0.0-RC2/LICENSE new file mode 100644 index 000000000..a3b5fedba --- /dev/null +++ b/com/nhaarman/mockitokotlin2/mockito-kotlin/2.0.0-RC2/LICENSE @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2010 Xtreme Labs, Pivotal Labs and Google Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.
\ No newline at end of file |