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

Conflicts:
	find.xml
This commit is contained in:
Aiko Mastboom 2020-09-27 21:45:51 +02:00
commit 8048ba7a32
5 changed files with 36 additions and 8 deletions

View File

@ -120,11 +120,6 @@
<custom-object-presentation />
</configuration>
</debugger>
<debugger id="kotlin_debugger">
<configuration>
<option name="DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED" value="true" />
</configuration>
</debugger>
</debuggers>
</component>
</application>

View File

@ -1,16 +1,36 @@
<application>
<component name="TextDiffSettings">
<component name="DiffSettings">
<option name="PLACES_MAP">
<entry key="Merge">
<entry key="ChangesView">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
<option name="DIFF_TOOLS_ORDER">
<list>
<option value="com.intellij.diff.tools.simple.SimpleDiffTool" />
<option value="com.intellij.diff.tools.fragmented.UnifiedDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool" />
<option value="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool" />
<option value="com.intellij.database.model.diff.SchemaDiffTool" />
<option value="com.intellij.database.diff.TableDiffTool" />
<option value="com.intellij.diff.tools.binary.BinaryDiffTool" />
<option value="com.intellij.diff.tools.dir.DirDiffTool" />
</list>
</option>
</PlaceSettings>
</entry>
</option>
</component>
<component name="TextDiffSettings">
<option name="PLACES_MAP">
<entry key="ChangesView">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings>
</entry>
<entry key="Merge">
<PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
</PlaceSettings>
</entry>
</option>
</component>
</application>

View File

@ -1,8 +1,12 @@
<application>
<component name="FindSettings">
<option name="caseSensitive" value="true" />
<option name="customScope" value="All Places" />
<option name="defaultScopeName" value="All Places" />
<option name="localCaseSensitive" value="true" />
<option name="showResultsInSeparateView" value="true" />
<option name="CASE_SENSITIVE_SEARCH" value="true" />
<option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
<option name="SHOW_RESULTS_IN_SEPARATE_VIEW" value="true" />
<option name="SEARCH_SCOPE" value="All Places" />
<mask>*.css</mask>

View File

@ -20,4 +20,9 @@
<option name="ELIXIR_CODE" value="true" />
</context>
</template>
<template name="handlep" value="def handle_params(params, _url, socket) do&#10; socket =&#10; assign(&#10; socket,&#10; $END$&#10; )&#10;&#10; {:noreply, socket}&#10;end&#10;" description="def handle_params(params, _url, socket) do" toReformat="false" toShortenFQNames="true">
<context>
<option name="ELIXIR_CODE" value="true" />
</context>
</template>
</templateSet>

View File

@ -18,6 +18,10 @@
<option name="url" value="https://github.com/Exact-Go/docker-machine-ip-config.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://github.com/aikomastboom/mkdomoticz.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list>
</option>
<option name="cloneParentDir" value="$USER_HOME$/Development" />