WS-2020.2 <martin@Cyan-Corvus-414 Merge branch 'master'

Conflicts:
	filetypes.xml

editor.codeinsight.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="CodeInsightSettings">
-    <option name="SURROUND_SELECTION_ON_QUOTE_TYPED" value="true" />
-  </component>
-</application>

editor.xml

@@ -1,5 +0,0 @@
-<application>
-  <component name="EditorSettings">
-    <option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" />
-  </component>
-</application>

filetypes.xml

@@ -1,9 +1,7 @@
 <application>
   <component name="FileTypeManager" version="17">
     <extensionMap>
-      <mapping pattern="*.js.flow" type="Flow" />
+      <mapping ext="csv" type="PLAIN_TEXT" />
-      <mapping pattern="*.js.flow" type="Flow" />
-      <mapping ext="old" type="PLAIN_TEXT" />
     </extensionMap>
   </component>
 </application>

remote-servers.xml

@@ -1,10 +0,0 @@
-<application>
-  <component name="RemoteServers">
-    <remote-server name="Docker" type="docker">
-      <configuration>
-        <option name="apiUrl" value="unix:///var/run/docker.sock" />
-        <option name="certificatesPath" value="$USER_HOME$/.docker" />
-      </configuration>
-    </remote-server>
-  </component>
-</application>

ui.lnf.xml

@@ -1,6 +0,0 @@
-<application>
-  <component name="UISettings">
-    <option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
-    <option name="SHOW_MAIN_TOOLBAR" value="true" />
-  </component>
-</application>