From 7f31cea8a9487ea6fadeea02aea3546c40d41bd2 Mon Sep 17 00:00:00 2001
From: DattatreyaReddy Panta
 <58727124+DattatreyaReddy@users.noreply.github.com>
Date: Sat, 11 Nov 2023 16:51:54 +0530
Subject: [PATCH] fixed merged conflict

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

diff --git a/pubspec.lock b/pubspec.lock
index f0493de1..baf9debf 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -465,10 +465,10 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      sha256: "474f7d506230897a3cd28c965ec21c5328ae5605fc9c400cd330e9e9d6ac175c"
+      sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.2"
+    version: "8.2.4"
   font_awesome_flutter:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6533de63..ea5e8427 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: tachidesk_sorayomi
 description: A new Flutter frontend for Tachidesk.
 
 publish_to: "none"
-version: 0.5.18+1
+version: 0.5.19+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"