resolve conflict

blueberry-team · Aug 31, 2024 · 27f0218 · 27f0218
2 parents 1d32c9a + 2da5e49
commit 27f0218
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/feature/match/provider/MatchProvider.dart b/lib/feature/match/provider/MatchProvider.dart
@@ -218,8 +218,7 @@ class MatchScreenNotifier extends StateNotifier<List<PetProfileModel>> {
   }
 }
 
-final matchScreenProvider = StateNotifierProvider<MatchScreenNotifier, List<PetProfileModel>>(
+final matchScreenProvider =
+    StateNotifierProvider<MatchScreenNotifier, List<PetProfileModel>>(
   (ref) => MatchScreenNotifier(),
 );
-
-
diff --git a/lib/model/FriendModel.dart b/lib/model/FriendModel.dart
@@ -2,6 +2,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'generated/FriendModel.freezed.dart';
+
 part 'generated/FriendModel.g.dart';
 
 @freezed
@@ -21,6 +22,7 @@ class FriendModel with _$FriendModel {
 }
 
 // Timestamp 변환 함수 서비스에 두고 임포트해서 사용 예정(해당 방식 리뷰 필요)
+// 최상위 함수로 Timestamp 변환 함수 정의
 DateTime fromJsonTimestamp(Timestamp timestamp) => timestamp.toDate();
 
 Timestamp toJsonTimestamp(DateTime date) => Timestamp.fromDate(date);