chore: conflicts 해결

YAPP-Github · Feb 4, 2024 · c826800 · c826800
1 parent 0ef42fa
commit c826800
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/data/src/main/java/com/susu/data/remote/model/response/EnvelopeDetailResponse.kt b/data/src/main/java/com/susu/data/remote/model/response/EnvelopeDetailResponse.kt
@@ -9,18 +9,11 @@ data class EnvelopeDetailResponse(
     val envelope: EnvelopeInfo,
     val category: CategoryInfo,
     val relationship: RelationshipInfo,
-    val friendRelationship: FriendRelationshipInfo,
+    val friendRelationship: FriendRelationShipInfo,
     val friend: FriendInfo,
 )
 
-@Serializable
-data class FriendRelationshipInfo(
-    val id: Long,
-    val friendId: Long,
-    val relationshipId: Long,
-)
-
-internal fun FriendRelationshipInfo.toModel() = FriendRelationship(
+internal fun FriendRelationShipInfo.toModel() = FriendRelationship(
     id = id,
     friendId = friendId,
     relationshipId = relationshipId,