(systemds) branch main updated: [MINOR] Fix corrupted merge conflicts

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new b394e32f2b [MINOR] Fix corrupted merge conflicts
b394e32f2b is described below

commit b394e32f2b95970e3509e565734ce60638832a23
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Sat Jan 17 14:14:11 2026 +0100

    [MINOR] Fix corrupted merge conflicts
---
 .../functions/einsum/SystemDS-config-einsum.xml      | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/test/scripts/functions/einsum/SystemDS-config-einsum.xml 
b/src/test/scripts/functions/einsum/SystemDS-config-einsum.xml
index 74e171a73a..f6640593c4 100644
--- a/src/test/scripts/functions/einsum/SystemDS-config-einsum.xml
+++ b/src/test/scripts/functions/einsum/SystemDS-config-einsum.xml
@@ -17,7 +17,6 @@
  * under the License.
 -->
 
-<<<<<<<< HEAD:src/test/scripts/functions/einsum/SystemDS-config-einsum.xml
 <root>
    <sysds.localtmpdir>/tmp/systemds</sysds.localtmpdir>
    <sysds.scratch>scratch_space</sysds.scratch>
@@ -27,22 +26,3 @@
     <sysds.local.spark.number.threads>16</sysds.local.spark.number.threads>
     <sysds.native.blas>auto</sysds.native.blas>
 </root>
-========
-package org.apache.sysds.runtime.io.hdf5;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public interface H5ByteReader extends Closeable {
-
-       ByteBuffer read(long offset, int length) throws IOException;
-
-       default ByteBuffer read(long offset, int length, ByteBuffer reuse) 
throws IOException {
-               return read(offset, length);
-       }
-
-       @Override
-       void close() throws IOException;
-}
->>>>>>>> 6b1708bd1e 
(dd):src/main/java/org/apache/sysds/runtime/io/hdf5/H5ByteReader.java