Skip to content

Commit dc44b1b

Browse files
committed
merged develop and fixed conflicts
1 parent 0caff3d commit dc44b1b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -461,4 +461,4 @@ class ProductService(
461461

462462
val logger = KotlinLogging.logger {}
463463
}
464-
}
464+
}

zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/AuthenticationMachtigingsDienstService.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package nl.nlportal.commonground.authentication
1717

1818
import com.fasterxml.jackson.core.type.TypeReference
19-
import mu.KLogger
20-
import mu.KotlinLogging
19+
import io.github.oshai.kotlinlogging.KLogger
20+
import io.github.oshai.kotlinlogging.KotlinLogging
2121
import nl.nlportal.core.util.Mapper
2222
import org.springframework.core.io.ResourceLoader
2323
import java.util.UUID

zgw/openklant/src/main/kotlin/nl/nlportal/openklant/service/OpenKlant2Service.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.nlportal.openklant.service
1717

18-
import mu.KotlinLogging
18+
import io.github.oshai.kotlinlogging.KotlinLogging
1919
import nl.nlportal.commonground.authentication.CommonGroundAuthentication
2020
import nl.nlportal.openklant.client.OpenKlant2KlantinteractiesClient
2121
import nl.nlportal.openklant.client.domain.OpenKlant2DigitaleAdres

0 commit comments

Comments
 (0)