Merge branch 'main' into merge-main-19-april-2024

Author: hmottestad

core/rio/turtle/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleWriterTest.java

@@ -725,10 +725,7 @@ public void testBlankNodeInlining_indirectCircularReferenceWithIRI() throws Exce
 	}
 
 	@Test
-<<<<<<< HEAD
-	public void testIgnoreAbbreviateNumbers() {
-=======
-	public void testIriNamespace() throws Exception {
+	public void testIriNamespace() {
 		Model model = new DynamicModelFactory().createEmptyModel();
 		String prefix = "foo-bar";
 		String ns = "foo:this.is.my.bar.";
@@ -742,8 +739,7 @@ public void testIriNamespace() throws Exception {
 	}
 
 	@Test
-	public void testIgnoreAbbreviateNumbers() throws Exception {
->>>>>>> main
+	public void testIgnoreAbbreviateNumbers() {
 		StringWriter sw = new StringWriter();
 
 		WriterConfig config = new WriterConfig();