Remove conflicts from Shrine

Author: cy245

Shrine/app/src/main/java/com/authentication/shrine/utility/Constants.kt

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:WebView/WebkitWebView/app/src/main/java/com/google/webkit/webviewsample/theme/Shape.kt
 package com.google.webkit.webviewsample.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -25,10 +24,3 @@ val Shapes = Shapes(
     medium = RoundedCornerShape(4.dp),
     large = RoundedCornerShape(0.dp),
 )
-========
-package com.authentication.shrine.utility
-
-object Constants {
-    const val SESSION_ID_KEY = "SESAME_SESSION_COOKIE="
-}
->>>>>>>> aa0a640 (Move Shrine app to main):Shrine/app/src/main/java/com/authentication/shrine/utility/Constants.kt

Shrine/gradle.properties

@@ -22,16 +22,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-<<<<<<<< HEAD:WebView/WebkitWebView/gradle.properties
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 host=https://alder-sunny-bicycle.glitch.me
-========
-
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
->>>>>>>> aa0a640 (Move Shrine app to main):Shrine/gradle.properties

Shrine/keystore.properties

@@ -1,9 +1,5 @@
 #
-<<<<<<<< HEAD:WebView/WebkitWebView/keystore.properties
 # Copyright 2025 Google LLC
-========
-# Copyright 2023 Google LLC
->>>>>>>> aa0a640 (Move Shrine app to main):Shrine/keystore.properties
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Shrine/spotless/copyright.kts

@@ -12,8 +12,4 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
-<<<<<<<< HEAD:WebView/WebkitWebView/spotless/copyright.kts
  */
-========
- */
->>>>>>>> aa0a640 (Move Shrine app to main):Shrine/spotless/copyright.kts

Shrine/wear/src/main/java/com/authentication/shrinewear/network/NetworkException.kt

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-<<<<<<<< HEAD:WebView/WebkitWebView/app/src/main/java/com/google/webkit/webviewsample/theme/Color.kt
 package com.google.webkit.webviewsample.theme
 
 import androidx.compose.ui.graphics.Color
@@ -22,13 +21,3 @@ val Purple200 = Color(0xFFBB86FC)
 val Purple500 = Color(0xFF6200EE)
 val Purple700 = Color(0xFF3700B3)
 val Teal200 = Color(0xFF03DAC5)
-========
-package com.authentication.shrinewear.network
-
-/**
- * An exception class for API errors.
- *
- * @param message The error message.
- */
-class NetworkException(message: String) : RuntimeException(message)
->>>>>>>> aa0a640 (Move Shrine app to main):Shrine/wear/src/main/java/com/authentication/shrinewear/network/NetworkException.kt