IU-2019.1.2 <aiko@pro.local Merge branch 'master'

Conflicts:
	baseRefactoring.xml
This commit is contained in:
Aiko Mastboom 2019-05-13 21:57:35 +02:00
commit 51aa398ab2
5 changed files with 6 additions and 18 deletions

View File

@ -1,5 +0,0 @@
<application>
<component name="Git.Application.Settings">
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
</component>
</application>

View File

@ -1,5 +1,6 @@
<application>
<component name="BaseRefactoringSettings">
<option name="SAFE_DELETE_WHEN_DELETE" value="false" />
<option name="MOVE_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />
</component>
</application>

View File

@ -1,7 +0,0 @@
<application>
<component name="FileTypeManager" version="17">
<extensionMap>
<removed_mapping pattern="setenv" approved="true" type="PLAIN_TEXT" />
</extensionMap>
</component>
</application>

View File

@ -1,6 +0,0 @@
<application>
<component name="FindSettings">
<option name="localRegularExpressions" value="true" />
<option name="LOCAL_REGULAR_EXPRESSIONS" value="true" />
</component>
</application>

View File

@ -0,0 +1,5 @@
<keymap version="1" name="Mac OS X copy" parent="Mac OS X">
<action id="Tool_External Tools_elm-format">
<keyboard-shortcut first-keystroke="shift meta l" />
</action>
</keymap>