Fix merge conflict mess

Author: helmo

interface/web/admin/lib/lang/el_system_config.lng

@@ -108,9 +108,6 @@ $wb['show_aps_menu_note_url_txt'] = 'Click here for more information.';
 $wb['dns_show_zoneexport_txt'] = 'Show zone export.';
 $wb['le_caa_autocreate_options_txt'] = 'Enable automatic creation of CAA record on issuing LE';
 $wb['show_delete_on_forms_txt'] = 'Show delete button on edit forms';
-<<<<<<< HEAD
-$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
-=======
 $wb['dns_external_slave_server_txt'] = 'External DNS servers (comma separated)';
->>>>>>> origin/develop
+$wb['mailbox_show_last_access_txt'] = 'Show last access time for mail accounts';
 ?>