WS-11.0.3 <Martin@Martin-PC Merge branch 'master'

This commit is contained in:
Martin Donnelly 2016-02-29 14:57:19 +00:00
commit 914a42b4e8
2 changed files with 3 additions and 2 deletions

View File

@ -1,9 +1,9 @@
<application> <application>
<component name="FileTypeManager" version="16"> <component name="FileTypeManager" version="16">
<extensionMap> <extensionMap>
<mapping pattern="DockerFile" type="Dockerfile" />
<mapping pattern="htpasswd" type="PLAIN_TEXT" /> <mapping pattern="htpasswd" type="PLAIN_TEXT" />
<mapping ext="config" type="PLAIN_TEXT" /> <mapping ext="config" type="PLAIN_TEXT" />
<mapping pattern="DockerFile" type="Dockerfile" />
</extensionMap> </extensionMap>
</component> </component>
</application> </application>

View File

@ -64,6 +64,7 @@
<option name="SHOW_PATH" value="true" /> <option name="SHOW_PATH" value="true" />
</component> </component>
<component name="NodeLocalInterpreterManager"> <component name="NodeLocalInterpreterManager">
<node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1453338704000" /> <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" />
</component> </component>
</application> </application>