martin/intellijsettings-MAC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master'

Browse Source
This commit is contained in:
martind2000 2016-02-22 22:43:38 +00:00
commit 37917e46f9
6 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codestyles/Default _1_.xml
View File

@ -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>

2
filetypes.xml
View File

@ -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>

30
ignore.xml
View File

@ -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

3
other.xml
View File

@ -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>

2
scratches.xml
View File

@ -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>

6
vcs.xml
View File

@ -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>