IU-2019.1.3 <aiko@Lindas-MacBook-Pro.local Merge branch 'master'

This commit is contained in:
Aiko Mastboom 2019-06-11 12:44:53 +02:00
commit 6621d2217c
4 changed files with 10 additions and 1 deletions

View File

@ -1,7 +1,7 @@
<application>
<component name="PathMacrosImpl">
<macro name="MAVEN_REPOSITORY" value="/Users/aiko/.m2/repository" />
<macro name="KOTLIN_BUNDLED" value="/Users/aiko/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/191.6707.61/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc" />
<macro name="KOTLIN_BUNDLED" value="/Users/aiko/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/191.7141.44/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc" />
<ignoredMacro name="MESSAGE" />
<ignoredMacro name="FILE_PATH" />
<ignoredMacro name="LINE" />

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>

7
filetypes.xml Normal file
View File

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

View File

@ -4,5 +4,6 @@
</component>
<component name="Registry">
<entry key="ide.mac.allowDarkWindowDecorations" value="true" />
<entry key="git.explicit.commit.renames.prohibit.multiple.calls" value="false" />
</component>
</application>