From d16796d0d94cd37e227daad79764cceb7b4f4807 Mon Sep 17 00:00:00 2001
From: Georg Fischer <snorpey@gmail.com>
Date: Wed, 13 Jan 2016 17:39:08 +0100
Subject: [PATCH] whitespace

---
 scripts/models/settingsmodel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/models/settingsmodel.js b/scripts/models/settingsmodel.js
index 91fdf36..587b94b 100644
--- a/scripts/models/settingsmodel.js
+++ b/scripts/models/settingsmodel.js
@@ -158,7 +158,7 @@ define(
 			}
 
 			function getValidSettings ( settings ) {
-				if ( settings&& defaultSettings && settings !== defaultSettings ) {
+				if ( settings && defaultSettings && settings !== defaultSettings ) {
 					settings = objectHelper.merge( settings, defaultSettings );
 				}