Master conflict Resolved

andoriyaprashant · andoriyaprashant · commit 58fe77207a13 · 2023-07-26T11:15:36.000+05:30
diff --git a/pubspec.lock b/pubspec.lock
@@ -273,7 +273,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.4"
->>>>>>> master
   diff_match_patch:
     dependency: transitive
     description:
