aiko/idea-shared-settings
aiko/idea-shared-settings
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	filetypes.xml
This commit is contained in:
Aiko Mastboom 2022-01-19 09:20:36 +01:00
commit 0d0499e8e6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diff.xml
View File

@ -24,7 +24,6 @@
<entry key="ChangesView"> <entry key="ChangesView">
<PlaceSettings> <PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" /> <option name="EXPAND_BY_DEFAULT" value="false" />
<option name="IGNORE_POLICY" value="TRIM_WHITESPACES" />
</PlaceSettings> </PlaceSettings>
</entry> </entry>
<entry key="CommitDialog"> <entry key="CommitDialog">

5
filetypes.xml
View File

@ -4,6 +4,9 @@
<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="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" />
<mapping ext="prj" type="PLAIN_TEXT" /> <mapping ext="prj" type="PLAIN_TEXT" />
@ -18,8 +21,6 @@
<removed_mapping ext="makefile" approved="true" type="textmate" /> <removed_mapping ext="makefile" approved="true" type="textmate" />
<removed_mapping ext="snakefile" approved="true" type="textmate" /> <removed_mapping ext="snakefile" approved="true" type="textmate" />
<removed_mapping pattern="setenv" approved="true" type="JSHELL" /> <removed_mapping pattern="setenv" approved="true" type="JSHELL" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="space.kts" type="Kotlin" />
</extensionMap> </extensionMap>
</component> </component>
</application> </application>