Resolved Merge Conflicts

This commit is contained in:
JohnVictoryz
2024-03-08 17:35:24 +02:00
parent c75f292f17
commit 9f1eba9895

View File

@@ -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>
</resources>