RD-2021.3.3 <rodude123@rodude123s-x360 Merge branch 'master'

Conflicts:
	nodejs.xml
This commit is contained in:
Rohit Pai 2022-02-09 14:20:19 +00:00
commit 92b79f31ac
3 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,6 @@
<application> <application>
<component name="CsvEditorSettings"> <component name="CsvEditorSettings">
<option name="CURRENT_PLUGIN_VERSION" value="2.18.1" /> <option name="CURRENT_PLUGIN_VERSION" value="2.18.2" />
<option name="USE_SOFT_WRAP" value="true" /> <option name="USE_SOFT_WRAP" value="true" />
</component> </component>
</application> </application>

View File

@ -4,10 +4,10 @@
<extensionMap> <extensionMap>
<mapping pattern="ArtifactDB" type="AUTO_DETECTED" /> <mapping pattern="ArtifactDB" type="AUTO_DETECTED" />
<mapping ext="mat" type="AUTO_DETECTED" /> <mapping ext="mat" type="AUTO_DETECTED" />
<mapping ext=".tabnine.model" type="Tabnine project model file" />
<mapping ext=".tabnine" type="Tabnine project model file" /> <mapping ext=".tabnine" type="Tabnine project model file" />
<mapping ext=".model" type="Tabnine project model file" /> <mapping ext=".model" type="Tabnine project model file" />
<mapping ext="tabnine" type="Tabnine project model file" /> <mapping ext="tabnine" type="Tabnine project model file" />
<mapping ext=".tabnine.model" type="Tabnine project model file" />
<mapping ext="model" type="Tabnine project model file" /> <mapping ext="model" type="Tabnine project model file" />
<removed_mapping ext="csv" approved="true" type="CSV" /> <removed_mapping ext="csv" approved="true" type="CSV" />
<removed_mapping ext="ignore" approved="true" type="IgnoreLang file" /> <removed_mapping ext="ignore" approved="true" type="IgnoreLang file" />

View File

@ -5,6 +5,7 @@
<option name="suppressed"> <option name="suppressed">
<set> <set>
<option value="or" /> <option value="or" />
<option value="Coca Cola" />
</set> </set>
</option> </option>
</SuppressingContext> </SuppressingContext>