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

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2e1f87cd..c3d60da1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -670,22 +670,20 @@
     <string name="view_following">View Following</string>
     <string name="menu">menu</string>
     <string name="view_followers">View Followers</string>
+    <string name="no_fav_anime">User has no favorite Anime</string>
+    <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>
+    <string name="anime_mean_score">Anime Mean Score</string>
+    <string name="volume_read">Volume read</string>
+    <string name="total_manga">Total Manga</string>
+    <string name="manga_mean_score">Manga Mean Score</string>
+    <string name="about_me">About me</string>
+    <string name="follow">Follow</string>
 
     <string name="time_stamps_auto_hide">Auto Hide Time Stamps</string>
     <string name="time_stamps_auto_hide_desc">Make the skip time stamp button disappear after 5 seconds</string>