~saiko/intellij-settings 

RD-2020.3.2 <saiko@invader Merge branch 'master'
RD-2020.3.2 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml	Create keymap.xml, IntelliJ _KDE_ copy.xml
CL-2020.3 <saiko@invader Update filetypes.xml
CL-2020.3 <saiko@invader Merge branch 'master'
CL-2020.3 <saiko@invader Update filetypes.xml
IU-2020.3.1 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml

IU-2020.3.1 <saiko@invader Update filetypes.xml
CL-2020.3 <saiko@invader Update filetypes.xml
RD-2020.3.2 <saiko@invader Merge branch 'master'
RD-2020.3.2 <saiko@invader Update colors.scheme.xml, editor.xml, laf.xml
CL-2020.3 <saiko@invader Merge branch 'master'
IU-2020.3.1 <saiko@invader Merge branch 'master'

Conflicts:
	editor.xml
	filetypes.xml

IU-2020.3.1 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml, colors.scheme.xml, editor.xml, laf.xml
CL-2020.3 <saiko@invader Update find.xml
CL-2020.3 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml, editor.xml
CL-2020.3 <saiko@invader Merge branch 'master'
CL-2020.3 <saiko@invader Update colors.scheme.xml, laf.xml
RD-2020.3.2 <saiko@invader Update _@user_Visual Studio Light.icls, editor.xml
RD-2020.3.2 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml
IU-2020.3.1 <saiko@invader Merge branch 'master'
IU-2020.3.1 <saiko@invader Update find.xml
Next