From fd49979f36b477e28d28a7357ea2f8fef6a366f0 Mon Sep 17 00:00:00 2001
From: martind2000 <martind2000@gmail.com>
Date: Thu, 10 Mar 2016 20:26:19 +0000
Subject: [PATCH 1/2] WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml,
 filetypes.xml	Delete code.style.schemes.xml

---
 code.style.schemes.xml |  7 -------
 filetypes.xml          |  2 ++
 ignore.xml             | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 code.style.schemes.xml

diff --git a/code.style.schemes.xml b/code.style.schemes.xml
deleted file mode 100644
index 583e825..0000000
--- a/code.style.schemes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
-  <component name="CodeStyleSchemeSettings">
-    <option name="CURRENT_SCHEME_NAME" value="Martins Style" />
-  </component>
-</application>
-
diff --git a/filetypes.xml b/filetypes.xml
index 0a6c7e3..11e9332 100644
--- a/filetypes.xml
+++ b/filetypes.xml
@@ -8,9 +8,11 @@
       <mapping pattern="scratch" type="PLAIN_TEXT" />
       <mapping pattern="temp" type="PLAIN_TEXT" />
       <mapping pattern=".pgpass" type="PLAIN_TEXT" />
+      <mapping pattern="htpasswd" type="PLAIN_TEXT" />
       <mapping pattern=".editorconfig" type="PLAIN_TEXT" />
       <mapping ext="opts" type="PLAIN_TEXT" />
       <mapping ext="config" type="PLAIN_TEXT" />
+      <mapping pattern="DockerFile" type="Dockerfile" />
     </extensionMap>
   </component>
 </application>
\ No newline at end of file
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 5e47533dbb2ce028d99f5386fb0c5150d0dcffdd Mon Sep 17 00:00:00 2001
From: martind2000 <martind2000@gmail.com>
Date: Sun, 13 Mar 2016 18:27:24 +0000
Subject: [PATCH 2/2] WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml,
 md.icls

---
 colors/md.icls |  2 +-
 ignore.xml     | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/colors/md.icls b/colors/md.icls
index 4356a3d..64f275a 100644
--- a/colors/md.icls
+++ b/colors/md.icls
@@ -1,7 +1,7 @@
 <scheme name="md" version="142" parent_scheme="Default">
   <option name="LINE_SPACING" value="1.0" />
   <option name="EDITOR_FONT_SIZE" value="11" />
-  <option name="EDITOR_FONT_NAME" value="Menlo" />
+  <option name="EDITOR_FONT_NAME" value="Monospaced" />
   <attributes>
     <option name="ABSTRACT_METHOD_ATTRIBUTES" baseAttributes="METHOD_CALL_ATTRIBUTES" />
     <option name="COFFEESCRIPT.FUNCTION_NAME" baseAttributes="DEFAULT_FUNCTION_DECLARATION" />
diff --git a/ignore.xml b/ignore.xml
index e0f45de..0357d59 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" 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" />
+      <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" />
     </languages>
     <userTemplates>
       <template name="Example user template">### Example user template