This is an automated email from the ASF dual-hosted git repository.
mengw15 pushed a commit to branch
backport/8803-drop-the-tmdb-example-dataset-and-list-t-v1.3
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to
refs/heads/backport/8803-drop-the-tmdb-example-dataset-and-list-t-v1.3 by this
push:
new ba63123cb4 fix(licensing, v1.3): resolve the LICENSE conflict (keep
only the Iris CC BY section)
ba63123cb4 is described below
commit ba63123cb48d9a2b4017450b4b6461d0a4856fa1
Author: mengw15 <[email protected]>
AuthorDate: Sat Oct 3 03:31:58 2026 -0700
fix(licensing, v1.3): resolve the LICENSE conflict (keep only the Iris CC
BY section)
---
LICENSE | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/LICENSE b/LICENSE
index 7f05b49f48..9d8c773927 100644
--- a/LICENSE
+++ b/LICENSE
@@ -254,8 +254,6 @@ build:
Copyright (c) 2016-present, Yarn Contributors
Source: https://github.com/yarnpkg/berry
License: BSD 2-Clause License (licenses-3rd-party-code/yarn.txt)
-<<<<<<< HEAD
-=======
Creative Commons Attribution 4.0 International (CC BY 4.0)
--------------------------------------
@@ -266,17 +264,3 @@ This product bundles the Iris example dataset:
Source: UCI Machine Learning Repository,
https://archive.ics.uci.edu/dataset/53/iris
DOI: 10.24432/C56C76
License: CC BY 4.0 (licenses/LICENSE-CC-BY-4.0.txt)
-
-Trademarks
---------------------------------------
-
-This product includes the Apple logo, a trademark of Apple Inc.:
- - frontend/src/assets/logos/apple-logo-white.svg
- Apple and the Apple logo are trademarks of Apple Inc., registered in the U.S.
- and other countries. The mark is included solely to render the "Continue with
- Apple" button, which Apple's guidelines require to carry their own artwork.
- Source:
https://developer.apple.com/design/human-interface-guidelines/sign-in-with-apple
- Use governed by Apple's Sign in with Apple usage guidelines, not by an
- open-source license:
-
https://developer.apple.com/sign-in-with-apple/usage-guidelines-for-websites-and-other-platforms/
->>>>>>> b05b6206c (fix(licensing): drop the TMDb example dataset and list the
bundled Iris dataset in LICENSE (#8803))
