WS-11.0.3 <martin@steamrunner.local Merge branch 'master'
This commit is contained in:
commit
8728e38e17
@ -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>
|
||||
|
@ -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" />
|
||||
|
@ -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>
|
30
ignore.xml
30
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
|
||||
|
Loading…
Reference in New Issue
Block a user