Resolved conflicts

[bookstack] / resources / lang / en / settings.php

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 3eec7737f913c493b8cf60b45e08b4a4cb64fd8c..0a7547a584aa7002a1f936122a3ee44b78aaa0de 100644 (file)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -91,6 +91,7 @@ return [
     'users_external_auth_id' => 'External Authentication ID',
     'users_password_warning' => 'Only fill the below if you would like to change your password:',
     'users_system_public' => 'This user represents any guest users that visit your instance. It cannot be used to log in but is assigned automatically.',
+    'users_books_display_type' => 'Preferred layout for books viewing',
     'users_delete' => 'Delete User',
     'users_delete_named' => 'Delete user :userName',
     'users_delete_warning' => 'This will fully delete this user with the name \':userName\' from the system.',