This is an automated email from the ASF dual-hosted git repository. jmalkin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/datasketches-spark.git
commit 50220f651d9c914a3cd84525f10834d182981796 Merge: 2cc419b 84e010f Author: Jon Malkin <[email protected]> AuthorDate: Fri Jan 10 17:53:07 2025 -0800 Merge pull request #11 from apache/fixes_after_conflict fixed problems introduced while resolving a conflict src/main/scala/org/apache/spark/sql/functions_ds.scala | 3 ++- .../org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
