IU-2020.2.2 <aiko@pro.local Merge branch 'master'
Conflicts: find.xml
This commit is contained in:
commit
8048ba7a32
@ -120,11 +120,6 @@
|
|||||||
<custom-object-presentation />
|
<custom-object-presentation />
|
||||||
</configuration>
|
</configuration>
|
||||||
</debugger>
|
</debugger>
|
||||||
<debugger id="kotlin_debugger">
|
|
||||||
<configuration>
|
|
||||||
<option name="DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED" value="true" />
|
|
||||||
</configuration>
|
|
||||||
</debugger>
|
|
||||||
</debuggers>
|
</debuggers>
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
||||||
26
diff.xml
26
diff.xml
@ -1,16 +1,36 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="TextDiffSettings">
|
<component name="DiffSettings">
|
||||||
<option name="PLACES_MAP">
|
<option name="PLACES_MAP">
|
||||||
<entry key="Merge">
|
<entry key="ChangesView">
|
||||||
<PlaceSettings>
|
<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>
|
</PlaceSettings>
|
||||||
</entry>
|
</entry>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="TextDiffSettings">
|
||||||
|
<option name="PLACES_MAP">
|
||||||
<entry key="ChangesView">
|
<entry key="ChangesView">
|
||||||
<PlaceSettings>
|
<PlaceSettings>
|
||||||
<option name="EXPAND_BY_DEFAULT" value="false" />
|
<option name="EXPAND_BY_DEFAULT" value="false" />
|
||||||
</PlaceSettings>
|
</PlaceSettings>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry key="Merge">
|
||||||
|
<PlaceSettings>
|
||||||
|
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
|
||||||
|
</PlaceSettings>
|
||||||
|
</entry>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
||||||
4
find.xml
4
find.xml
@ -1,8 +1,12 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="FindSettings">
|
<component name="FindSettings">
|
||||||
|
<option name="caseSensitive" value="true" />
|
||||||
<option name="customScope" value="All Places" />
|
<option name="customScope" value="All Places" />
|
||||||
<option name="defaultScopeName" value="All Places" />
|
<option name="defaultScopeName" value="All Places" />
|
||||||
|
<option name="localCaseSensitive" value="true" />
|
||||||
<option name="showResultsInSeparateView" 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="SHOW_RESULTS_IN_SEPARATE_VIEW" value="true" />
|
||||||
<option name="SEARCH_SCOPE" value="All Places" />
|
<option name="SEARCH_SCOPE" value="All Places" />
|
||||||
<mask>*.css</mask>
|
<mask>*.css</mask>
|
||||||
|
|||||||
@ -20,4 +20,9 @@
|
|||||||
<option name="ELIXIR_CODE" value="true" />
|
<option name="ELIXIR_CODE" value="true" />
|
||||||
</context>
|
</context>
|
||||||
</template>
|
</template>
|
||||||
|
<template name="handlep" value="def handle_params(params, _url, socket) do socket = assign( socket, $END$ ) {:noreply, socket} end " description="def handle_params(params, _url, socket) do" toReformat="false" toShortenFQNames="true">
|
||||||
|
<context>
|
||||||
|
<option name="ELIXIR_CODE" value="true" />
|
||||||
|
</context>
|
||||||
|
</template>
|
||||||
</templateSet>
|
</templateSet>
|
||||||
4
vcs.xml
4
vcs.xml
@ -18,6 +18,10 @@
|
|||||||
<option name="url" value="https://github.com/Exact-Go/docker-machine-ip-config.git" />
|
<option name="url" value="https://github.com/Exact-Go/docker-machine-ip-config.git" />
|
||||||
<option name="userName" value="" />
|
<option name="userName" value="" />
|
||||||
</UrlAndUserName>
|
</UrlAndUserName>
|
||||||
|
<UrlAndUserName>
|
||||||
|
<option name="url" value="https://github.com/aikomastboom/mkdomoticz.git" />
|
||||||
|
<option name="userName" value="" />
|
||||||
|
</UrlAndUserName>
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
<option name="cloneParentDir" value="$USER_HOME$/Development" />
|
<option name="cloneParentDir" value="$USER_HOME$/Development" />
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user