IU-2021.3.1 <aiko@pro.local Merge branch 'master'
Conflicts: filetypes.xml
This commit is contained in:
commit
a128cb21d3
@ -4,8 +4,8 @@
|
|||||||
<mapping pattern="setenv" type="AUTO_DETECTED" />
|
<mapping pattern="setenv" type="AUTO_DETECTED" />
|
||||||
<mapping ext="aiko" type="AUTO_DETECTED" />
|
<mapping ext="aiko" type="AUTO_DETECTED" />
|
||||||
<mapping pattern=".dockerignore" type="GitIgnore file" />
|
<mapping pattern=".dockerignore" type="GitIgnore file" />
|
||||||
<mapping ext="space.kts" type="Kotlin" />
|
|
||||||
<mapping ext="main.kts" type="Kotlin" />
|
<mapping ext="main.kts" type="Kotlin" />
|
||||||
|
<mapping ext="space.kts" type="Kotlin" />
|
||||||
<mapping ext="heex" type="Live Embedded Elixir" />
|
<mapping ext="heex" type="Live Embedded Elixir" />
|
||||||
<mapping pattern="gemfile.lock" type="PLAIN_TEXT" />
|
<mapping pattern="gemfile.lock" type="PLAIN_TEXT" />
|
||||||
<mapping ext="plist" type="PLAIN_TEXT" />
|
<mapping ext="plist" type="PLAIN_TEXT" />
|
||||||
|
|||||||
2
laf.xml
2
laf.xml
@ -1,5 +1,5 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="LafManager" autodetect="true">
|
<component name="LafManager" autodetect="true">
|
||||||
<laf class-name="com.intellij.ide.ui.laf.IntelliJLaf" themeId="JetBrainsLightTheme" />
|
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
||||||
Loading…
x
Reference in New Issue
Block a user