>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20285 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
* [NO ISSUE] Add missing licenses
Ext-ref: MB-68123
Change-Id: Idb944075041543db9293fb7a5b724e261cf0febc
---
M
asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
2 files changed, 18 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/85/20285/1
diff --git
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
index f6a7c75..d1ca00f 100644
---
a/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
+++
b/asterixdb/src/main/licenses/content/com.microsoft.azure--msal4j-persistence-extension--1.3.0_MIT_License.txt
@@ -18,9 +18,4 @@
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
-<<<<<<< HEAD (2eb5dc [ASTERIXDB-3639]: add datasetName for index)
- SOFTWARE
-=======
- SOFTWARE
-
->>>>>>> BRANCH (480ca9 Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ SOFTWARE
\ No newline at end of file
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20285
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Idb944075041543db9293fb7a5b724e261cf0febc
Gerrit-Change-Number: 20285
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
