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 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" />
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user