From effce0151da82e38d4e8e470b871fcc48f0f9750 Mon Sep 17 00:00:00 2001
From: Rachit Sharma <45431705+developer-rachit@users.noreply.github.com>
Date: Tue, 25 Oct 2022 16:29:55 +0530
Subject: [PATCH 1/3] add ionicons dependency

---
 pubspec.lock | 7 +++++++
 pubspec.yaml | 1 +
 2 files changed, 8 insertions(+)

diff --git a/pubspec.lock b/pubspec.lock
index cc0c6e25..c4f8380d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -681,6 +681,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
+  ionicons:
+    dependency: "direct main"
+    description:
+      name: ionicons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1"
   js:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 516f3258..ebab6116 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -50,6 +50,7 @@ dependencies:
   infinite_scroll_pagination: ^3.2.0
   injectable: ^1.5.3
   intl: ^0.17.0
+  ionicons: ^0.2.1
   json_annotation: ^4.6.0
   meta: ^1.7.0
   mime: ^1.0.2

From 28b27d4c90e37d0016366d9557c0399d0c92f0c8 Mon Sep 17 00:00:00 2001
From: Rachit Sharma <45431705+developer-rachit@users.noreply.github.com>
Date: Tue, 25 Oct 2022 16:49:17 +0530
Subject: [PATCH 2/3] resolved conflicts

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index ebab6116..e6f29485 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
   injectable: ^1.5.3
   intl: ^0.17.0
   ionicons: ^0.2.1
-  json_annotation: ^4.6.0
+  json_annotation: ^4.7.0
   meta: ^1.7.0
   mime: ^1.0.2
   mocktail: ^0.3.0

From 146bb2e6c6b5db73774ccc80f6796b7958e7f611 Mon Sep 17 00:00:00 2001
From: Rachit Sharma <45431705+developer-rachit@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:32:48 +0530
Subject: [PATCH 3/3] resolving conflicts

---
 pubspec.lock | 4 ++--
 pubspec.yaml | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index c4f8380d..dda77674 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -738,14 +738,14 @@ packages:
     source: hosted
     version: "0.1.5"
   meta:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
   mime:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: mime
       url: "https://pub.dartlang.org"
diff --git a/pubspec.yaml b/pubspec.yaml
index e6f29485..b20c50a4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -52,8 +52,6 @@ dependencies:
   intl: ^0.17.0
   ionicons: ^0.2.1
   json_annotation: ^4.7.0
-  meta: ^1.7.0
-  mime: ^1.0.2
   mocktail: ^0.3.0
   package_info_plus: ^1.3.0
   phone_number: ^1.0.0