Resolved merge conflicts

This commit is contained in:
Bnyro 2022-05-05 18:40:35 +02:00
parent 51756dd66f
commit 01d34304f4

View File

@ -6,8 +6,6 @@
<string name="yes">Yes</string> <string name="yes">Yes</string>
<string name="choose_quality_dialog">Choose Quality:</string> <string name="choose_quality_dialog">Choose Quality:</string>
<string name="search_hint">Search</string> <string name="search_hint">Search</string>
<string name="subscribe">SUBSCRIBE</string>
<string name="unsubscribe">UNSUBSCRIBE</string>
<string name="videos">Videos</string> <string name="videos">Videos</string>
<string name="subscribe">Subscribe</string> <string name="subscribe">Subscribe</string>
<string name="unsubscribe">Unsubscribe</string> <string name="unsubscribe">Unsubscribe</string>