IU-2019.1.2 <aiko@pro.local Merge branch 'master'
Conflicts: baseRefactoring.xml
This commit is contained in:
commit
51aa398ab2
@ -1,5 +0,0 @@
|
|||||||
<application>
|
|
||||||
<component name="Git.Application.Settings">
|
|
||||||
<option name="SSH_EXECUTABLE" value="IDEA_SSH" />
|
|
||||||
</component>
|
|
||||||
</application>
|
|
||||||
@ -1,5 +1,6 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="BaseRefactoringSettings">
|
<component name="BaseRefactoringSettings">
|
||||||
<option name="SAFE_DELETE_WHEN_DELETE" value="false" />
|
<option name="SAFE_DELETE_WHEN_DELETE" value="false" />
|
||||||
|
<option name="MOVE_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
||||||
@ -1,7 +0,0 @@
|
|||||||
<application>
|
|
||||||
<component name="FileTypeManager" version="17">
|
|
||||||
<extensionMap>
|
|
||||||
<removed_mapping pattern="setenv" approved="true" type="PLAIN_TEXT" />
|
|
||||||
</extensionMap>
|
|
||||||
</component>
|
|
||||||
</application>
|
|
||||||
6
find.xml
6
find.xml
@ -1,6 +0,0 @@
|
|||||||
<application>
|
|
||||||
<component name="FindSettings">
|
|
||||||
<option name="localRegularExpressions" value="true" />
|
|
||||||
<option name="LOCAL_REGULAR_EXPRESSIONS" value="true" />
|
|
||||||
</component>
|
|
||||||
</application>
|
|
||||||
5
keymaps/Mac OS X copy.xml
Normal file
5
keymaps/Mac OS X copy.xml
Normal 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>
|
||||||
Loading…
x
Reference in New Issue
Block a user