pulled java fix

ebenetce · Apr 9, 2024 · 189149b · 189149b
1 parent f1d2b56
commit 189149b
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 94 deletions.
diff --git a/BUILD b/BUILD
@@ -1 +1,5 @@
-20231205-1427
+<<<<<<< HEAD
+20231205-1427
+=======
+20240409-0913
+>>>>>>> adaa19c (workaround for issue #254 respin)