IU-2021.2.2 <aiko@pro.local Merge branch 'master'
Conflicts: filetypes.xml
This commit is contained in:
commit
a777373a98
@ -1,5 +1,5 @@
|
||||
<application>
|
||||
<component name="EditorColorsManagerImpl">
|
||||
<global_color_scheme name="IntelliJ Light" />
|
||||
<global_color_scheme name="Darcula" />
|
||||
</component>
|
||||
</application>
|
||||
@ -9,12 +9,21 @@
|
||||
<mapping ext="heex" type="Live Embedded Elixir" />
|
||||
<mapping pattern="gemfile.lock" type="PLAIN_TEXT" />
|
||||
<mapping ext="plist" type="PLAIN_TEXT" />
|
||||
<mapping ext="prj" type="PLAIN_TEXT" />
|
||||
<mapping ext="orig" type="PLAIN_TEXT" />
|
||||
<mapping pattern="setenv*" type="Shell Script" />
|
||||
<mapping pattern="elixir" type="Shell Script" />
|
||||
<mapping ext="env" type="Shell Script" />
|
||||
<mapping ext="qrc" type="XML" />
|
||||
<removed_mapping ext="bat" approved="true" type="PLAIN_TEXT" />
|
||||
<removed_mapping ext="cmd" approved="true" type="PLAIN_TEXT" />
|
||||
<removed_mapping ext="dockerfile" approved="true" type="textmate" />
|
||||
<removed_mapping ext="log" approved="true" type="PLAIN_TEXT" />
|
||||
<removed_mapping ext="makefile" approved="true" type="textmate" />
|
||||
<removed_mapping ext="snakefile" approved="true" type="textmate" />
|
||||
<removed_mapping pattern="setenv" approved="true" type="JSHELL" />
|
||||
<mapping ext="main.kts" type="Kotlin" />
|
||||
<mapping ext="space.kts" type="Kotlin" />
|
||||
</extensionMap>
|
||||
</component>
|
||||
</application>
|
||||
Loading…
x
Reference in New Issue
Block a user