fix: merge conflicts

Informatievlaanderen · Nov 19, 2024 · 7ca66cb · 7ca66cb
1 parent 279d2b4
commit 7ca66cb
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...tievlaanderen/ldes/server/admin/rest/controllers/AdminEventStreamsRestControllerTest.java b/...tievlaanderen/ldes/server/admin/rest/controllers/AdminEventStreamsRestControllerTest.java
@@ -15,7 +15,6 @@
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.model.FragmentationConfig;
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.model.ViewName;
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.model.ViewSpecification;
-import be.vlaanderen.informatievlaanderen.ldes.server.domain.rest.PrefixConstructor;
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.rest.HostNamePrefixConstructorConfig;
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.rest.RelativeUriPrefixConstructor;
 import be.vlaanderen.informatievlaanderen.ldes.server.domain.versioning.VersionHeaderFilterConfig;
@@ -66,7 +65,7 @@
 		ViewSpecificationConverter.class, PrefixAdderImpl.class, ValidatorsConfig.class,
 		AdminRestResponseEntityExceptionHandler.class, RetentionModelExtractor.class, CharsetEncodingConfig.class,
 		FragmentationConfigExtractor.class, HostNamePrefixConstructorConfig.class, RelativeUriPrefixConstructor.class, RdfModelConverter.class, VersionHeaderFilterConfig.class})
-@Import(BuildProperties.class)
+@Import(AdminEventStreamsRestControllerTest.VersionConfig.class)
 class AdminEventStreamsRestControllerTest {
 	private static final String COLLECTION = "name1";
 	public static final String TIMESTAMP_PATH = "http://purl.org/dc/terms/created";