From 4aec39df7a1c1726a37d5f12a65c71db2383c40d Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Fri, 17 Mar 2017 14:32:01 +0100
Subject: [PATCH] Fix Merge Conflicts.

---
 CHANGELOG.md                    | 3 ++-
 modules/default/clock/README.md | 1 +
 modules/default/clock/clock.js  | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1001eef6..ffb4e9c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,8 +50,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added console warning on startup when deprecated config options are used
 - Add option to display temperature unit label to the current weather module
 - Added ability to disable wrapping of news items
-- Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`).
+- Updated Norwegian translation.
 - Added hideLoading option for News Feed module
+- Added configurable dateFormat to clock module.
 
 ### Fixed
 - Update .gitignore to not ignore default modules folder.
diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md
index 5570ff5a..f518a2b2 100644
--- a/modules/default/clock/README.md
+++ b/modules/default/clock/README.md
@@ -30,6 +30,7 @@ The following properties can be configured:
 | `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `clockBold`       | Remove the colon and bold the minutes to make a more modern look. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
 | `showDate`        | Turn off or on the Date section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
+| `dateFormat`      | Configure the date format as you like. <br><br> **Possible values:** [Docs](http://momentjs.com/docs/#/displaying/format/) <br> **Default value:** `"dddd, LL"`
 | `displayType`     | Display a digital clock, analog clock, or both together. <br><br> **Possible values:** `digital`, `analog`, or `both` <br> **Default value:** `digital`
 | `analogSize`      | **Specific to the analog clock.** Defines how large the analog display is. <br><br> **Possible values:** A positive number of pixels` <br> **Default value:** `200px`
 | `analogFace`      | **Specific to the analog clock.** Specifies which clock face to use. <br><br> **Possible values:** `simple` for a simple border, `none` for no face or border, or `face-###` (where ### is currently a value between 001 and 012, inclusive) <br> **Default value:** `simple`
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index e15fbbbd..21e665e7 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -16,6 +16,7 @@ Module.register("clock",{
 		showPeriodUpper: false,
 		clockBold: false,
 		showDate: true,
+		dateFormat: "dddd, LL",
 
 		/* specific to the analog clock */
 		analogSize: "200px",
@@ -87,7 +88,7 @@ Module.register("clock",{
 		}
 
 		if(this.config.showDate){
-			dateWrapper.innerHTML = now.format("dddd, LL");
+			dateWrapper.innerHTML = now.format(this.config.dateFormat);
 		}
 		timeWrapper.innerHTML = timeString;
 		secondsWrapper.innerHTML = now.format("ss");