PS-2021.3 <rodude123@rodude123s-x360 Merge branch 'master'

This commit is contained in:
Rohit Pai 2022-01-11 21:40:37 +00:00
commit 1cf523c6e1
2 changed files with 2 additions and 6 deletions

View File

@ -1,5 +0,0 @@
<application>
<component name="DockerSettings">
<option name="dockerMachinePath" value="docker-machine" />
</component>
</application>

View File

@ -3,10 +3,11 @@
<ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" /> <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
<extensionMap> <extensionMap>
<mapping pattern="ArtifactDB" type="AUTO_DETECTED" /> <mapping pattern="ArtifactDB" type="AUTO_DETECTED" />
<mapping ext=".tabnine.model" type="Tabnine project model file" /> <mapping ext="mat" type="AUTO_DETECTED" />
<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" />