fix merge conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/config/config.sample.php b/config/config.sample.php
index 50dec9e421e..86bc20b714e 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -56,6 +56,9 @@ $CONFIG = array(
 /* Theme to use for ownCloud */
 "theme" => "",
 
+/* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user's language preference configured under "personal -> language" once they have logged in */
+"default_language" => "en",
+
 /* Path to the parent directory of the 3rdparty directory */
 "3rdpartyroot" => "",
 
@@ -154,7 +157,7 @@ $CONFIG = array(
 /* Enable/disable X-Frame-Restriction */
 /* HIGH SECURITY RISK IF DISABLED*/
 "xframe_restriction" => true,
-	
+
 /* The directory where the user data is stored, default to data in the owncloud
  * directory. The sqlite database is also stored here, when sqlite is used.
  */
@@ -196,4 +199,6 @@ $CONFIG = array(
 'preview_max_scale_factor' => 10,
 /* custom path for libreoffice / openoffice binary */
 'preview_libreoffice_path' => '/usr/bin/libreoffice',
+// date format to be used while writing to the owncloud logfile
+'logdateformat' => 'F d, Y H:i:s',
 );