~saiko/intellij-settings

f8eade809e334a6be9b71def51613d7bfe949d2c — 2xsaiko 23 days ago 097cfd9 + 42a81c0
IU-2020.2 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml
1 files changed, 0 insertions(+), 3 deletions(-)

M filetypes.xml
M filetypes.xml => filetypes.xml +0 -3
@@ 5,9 5,6 @@
      <mapping ext="main.kts" type="Kotlin" />
      <mapping ext="xcf" type="Native" />
      <mapping pattern="LICENSE" type="PLAIN_TEXT" />
      <mapping ext="in" type="PLAIN_TEXT" />
      <mapping ext="ac" type="PLAIN_TEXT" />
      <mapping ext="am" type="PLAIN_TEXT" />
    </extensionMap>
  </component>
</application>
\ No newline at end of file