From 1fe42f3a2ae58a06c0cd71c05f2e4e077fedfce4 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@hotmail.com>
Date: Mon, 22 Feb 2016 09:47:28 +0000
Subject: [PATCH 1/5] WS-11.0.3 <Martin@Martin-PC Update ignore.xml

---
 ignore.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ignore.xml b/ignore.xml
index 0357d59..e0f45de 100644
--- a/ignore.xml
+++ b/ignore.xml
@@ -1,21 +1,21 @@
 <application>
   <component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" settingsFixed="true">
     <languages>
-      <language id="Bazaar" ENABLE="true" NEW_FILE="true" />
-      <language id="Chef" ENABLE="false" NEW_FILE="true" />
-      <language id="Cvs" ENABLE="true" NEW_FILE="true" />
-      <language id="Darcs" ENABLE="true" NEW_FILE="true" />
-      <language id="Docker" ENABLE="false" NEW_FILE="true" />
-      <language id="Floobits" ENABLE="false" NEW_FILE="true" />
-      <language id="Fossil" ENABLE="true" NEW_FILE="true" />
-      <language id="Git" ENABLE="true" NEW_FILE="true" />
-      <language id="JSHint" ENABLE="false" NEW_FILE="true" />
-      <language id="Mercurial" ENABLE="true" NEW_FILE="true" />
-      <language id="Monotone" ENABLE="true" NEW_FILE="true" />
-      <language id="Nodemon" ENABLE="false" NEW_FILE="true" />
-      <language id="Npm" ENABLE="false" NEW_FILE="true" />
-      <language id="Perforce" ENABLE="true" NEW_FILE="true" />
-      <language id="Team Foundation" ENABLE="true" NEW_FILE="true" />
+      <language id="Bazaar" NEW_FILE="true" ENABLE="true" />
+      <language id="Chef" NEW_FILE="true" ENABLE="false" />
+      <language id="Cvs" NEW_FILE="true" ENABLE="true" />
+      <language id="Darcs" NEW_FILE="true" ENABLE="true" />
+      <language id="Docker" NEW_FILE="true" ENABLE="false" />
+      <language id="Floobits" NEW_FILE="true" ENABLE="false" />
+      <language id="Fossil" NEW_FILE="true" ENABLE="true" />
+      <language id="Git" NEW_FILE="true" ENABLE="true" />
+      <language id="JSHint" NEW_FILE="true" ENABLE="false" />
+      <language id="Mercurial" NEW_FILE="true" ENABLE="true" />
+      <language id="Monotone" NEW_FILE="true" ENABLE="true" />
+      <language id="Nodemon" NEW_FILE="true" ENABLE="false" />
+      <language id="Npm" NEW_FILE="true" ENABLE="false" />
+      <language id="Perforce" NEW_FILE="true" ENABLE="true" />
+      <language id="Team Foundation" NEW_FILE="true" ENABLE="true" />
     </languages>
     <userTemplates>
       <template name="Example user template">### Example user template

From 310573d4490f5311058e4074ef54d12fe41f316a Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@hotmail.com>
Date: Mon, 22 Feb 2016 10:16:08 +0000
Subject: [PATCH 2/5] WS-11.0.3 <Martin@Martin-PC Update filetypes.xml

---
 filetypes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filetypes.xml b/filetypes.xml
index 493c7ae..7735e6d 100644
--- a/filetypes.xml
+++ b/filetypes.xml
@@ -1,8 +1,8 @@
 <application>
   <component name="FileTypeManager" version="16">
     <extensionMap>
-      <mapping ext="config" type="PLAIN_TEXT" />
       <mapping pattern="DockerFile" type="Dockerfile" />
+      <mapping ext="config" type="PLAIN_TEXT" />
     </extensionMap>
   </component>
 </application>
\ No newline at end of file

From 7f2a99ec096475340081269aadf118869f412c7c Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@hotmail.com>
Date: Mon, 22 Feb 2016 10:30:38 +0000
Subject: [PATCH 3/5] WS-11.0.3 <Martin@Martin-PC Update Default _1_.xml,
 vcs.xml

---
 codestyles/Default _1_.xml | 3 +++
 vcs.xml                    | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/codestyles/Default _1_.xml b/codestyles/Default _1_.xml
index 0799441..f8891ed 100644
--- a/codestyles/Default _1_.xml	
+++ b/codestyles/Default _1_.xml	
@@ -1,4 +1,7 @@
 <code_scheme name="Default (1)">
+  <MultiMarkdownCodeStyleSettings>
+    <option name="RIGHT_MARGIN" value="72" />
+  </MultiMarkdownCodeStyleSettings>
   <XML>
     <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
   </XML>
diff --git a/vcs.xml b/vcs.xml
index 194e3be..6315a6b 100644
--- a/vcs.xml
+++ b/vcs.xml
@@ -10,8 +10,12 @@
           <option name="url" value="http://censis.visualstudio.com" />
           <option name="userName" value="martind2000@hotmail.com" />
         </UrlAndUserName>
+        <UrlAndUserName>
+          <option name="url" value="https://censis.visualstudio.com/DefaultCollection/SmartOffice/_git/soDocker" />
+          <option name="userName" value="" />
+        </UrlAndUserName>
       </list>
     </option>
-    <option name="cloneParentDir" value="C:\Users\marti\dev" />
+    <option name="cloneParentDir" value="C:\dev" />
   </component>
 </application>
\ No newline at end of file

From b865d192b3f8efbbb57bf562279d52e3e5f5afc2 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@hotmail.com>
Date: Mon, 22 Feb 2016 10:57:58 +0000
Subject: [PATCH 4/5] WS-11.0.3 <Martin@Martin-PC Update other.xml

---
 other.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/other.xml b/other.xml
index 1d41ddb..fb7cde5 100644
--- a/other.xml
+++ b/other.xml
@@ -64,7 +64,6 @@
     <option name="SHOW_PATH" value="true" />
   </component>
   <component name="NodeLocalInterpreterManager">
-    <node-interpreter path="C:/Program Files (x86)/nodejs/node.exe" version="5.4.0" last-modified="1452116096000" />
-    <node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1455371313740" />
+    <node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1453338704000" />
   </component>
 </application>
\ No newline at end of file

From e5f7a057bc9329c69b4c82a2d3a6d90b347c7025 Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@hotmail.com>
Date: Mon, 22 Feb 2016 17:05:20 +0000
Subject: [PATCH 5/5] WS-11.0.3 <Martin@Martin-PC Update scratches.xml

---
 scratches.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scratches.xml b/scratches.xml
index 5d50e83..75409cf 100644
--- a/scratches.xml
+++ b/scratches.xml
@@ -2,5 +2,7 @@
   <component name="ScratchFileService">
     <file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch" value="HTML" />
     <file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1" value="HTML" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_2" value="JavaScript" />
+    <file url="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_3" value="JavaScript" />
   </component>
 </application>
\ No newline at end of file