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

Conflicts:
	filetypes.xml
This commit is contained in:
Aiko Mastboom 2022-01-13 13:33:16 +01:00
commit a128cb21d3
2 changed files with 2 additions and 2 deletions

View File

@ -4,8 +4,8 @@
<mapping pattern="setenv" type="AUTO_DETECTED" />
<mapping ext="aiko" type="AUTO_DETECTED" />
<mapping pattern=".dockerignore" type="GitIgnore file" />
<mapping ext="space.kts" type="Kotlin" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="space.kts" type="Kotlin" />
<mapping ext="heex" type="Live Embedded Elixir" />
<mapping pattern="gemfile.lock" type="PLAIN_TEXT" />
<mapping ext="plist" type="PLAIN_TEXT" />

View File

@ -1,5 +1,5 @@
<application>
<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>
</application>