From 9f1eba9895cd423099ade9a376d2de3cc8500d08 Mon Sep 17 00:00:00 2001
From: JohnVictoryz <john.g.zioupos@gmail.com>
Date: Fri, 8 Mar 2024 17:35:24 +0200
Subject: [PATCH] Resolved Merge Conflicts

---
 app/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22054e49..89cc8d51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -674,7 +674,7 @@
     <string name="no_fav_manga">User has no favorite Manga</string>
     <string name="fav_character">Favourite Characters</string>
     <string name="fav_staff">Favorite Staff</string>
-
+    
     <string name="stats">Stats</string>
     <string name="days_watched">Days watched</string>
     <string name="total_anime">Total Anime</string>
@@ -684,5 +684,5 @@
     <string name="manga_mean_score">Manga Mean Score</string>
     <string name="about_me">About me</string>
     <string name="follow">Follow</string>
-
-</resources>
\ No newline at end of file
+    
+</resources>