Fix stash issue

Author: Joe3112

gradle.properties

@@ -28,13 +28,6 @@ app.morestuff.host.login=login-callback
 #org.jetbrains.compose.experimental.uikit.enabled=true
 
 kotlin.native.binary.options=-Xbinary=bundleId=io.middlepoint.morestuff
-<<<<<<< Updated upstream
-kotlin.native.cacheKind=none
-=======
-<<<<<<< Updated upstream
-
-=======
 kotlin.native.cacheKind=none
 kotlin.native.ignoreDisabledTargets=true
->>>>>>> Stashed changes
->>>>>>> Stashed changes
+