From 5a641f09bfdef830a8e5f7bcbde3df0d60724c4f Mon Sep 17 00:00:00 2001
From: Steffen Lien <steffen.lien@nav.no>
Date: Thu, 3 Feb 2022 08:29:15 +0100
Subject: [PATCH] fix merge issue

---
 backend/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 9646c17e34..5644b35272 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -4,7 +4,7 @@
 
 plugins {
     application
-    kotlin("jvm") version "1.5.31"
+    kotlin("jvm") version "1.6.10"
     id("org.jetbrains.kotlin.plugin.serialization") version "1.5.31"
     id("org.flywaydb.flyway") version "8.0.3"
     id("com.github.johnrengelman.shadow") version "7.0.0"