Fix merge issue

Author: niftynei

app/src/main/res/values/strings.xml

@@ -74,7 +74,6 @@
     <string name="no_message">No messages to receive.</string>
     <string name="menu_filter">Filter</string>
     <string name="menu_today">Today</string>
-    <string name="empty_list">Sorry, no messages here.</string>
     <string name="http_or_https">HTTP/HTTPS</string>
     <string name="http_message">HTTP is insecure, and we recommend using it only for testing the Zulip Android app against a development environment. Are you sure you want to use HTTP?</string>
     <string name="use_https">Use HTTPS</string>