>From Michael Blow <[email protected]>: Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20284 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity' ...................................................................... Merge branch 'gerrit/neo' into 'gerrit/trinity' * [NO ISSUE] Add missing licenses Ext-ref: MB-68123 Change-Id: Iee4d3e6ed024f4161db81ac7428d50ddc80ae255 --- M asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt 2 files changed, 16 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/84/20284/1 diff --git a/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt b/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt index 4849bcf..e1de75a 100644 --- a/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt +++ b/asterixdb/src/main/licenses/content/www.bouncycastle.org_licence.html.txt @@ -1,13 +1,3 @@ -<<<<<<< HEAD (4565c0 Merge branch 'gerrit/neo' into 'gerrit/trinity') -BOUNCY CASTLE LICENSE -Copyright (c) 2000 - 2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) - -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. -======= Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software @@ -25,4 +15,3 @@ 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. ->>>>>>> BRANCH (4f0146 [NO ISSUE] Add missing licenses) -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20284 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: Iee4d3e6ed024f4161db81ac7428d50ddc80ae255 Gerrit-Change-Number: 20284 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-MessageType: newchange
