PY-2022.2.3 <rodude123@rodude123s-yoga7 Merge branch 'master'
Conflicts: filetypes.xml
This commit is contained in:
		
						commit
						1e734f2619
					
				@ -2,9 +2,21 @@
 | 
			
		||||
  <component name="FileTypeManager" version="18">
 | 
			
		||||
    <ignoreFiles list="*$py.class;*.pyc;*.pyo;*.rbc;*.yarb;*~;.DS_Store;.git;.hg;.svn;CVS;__pycache__;_svn;vssver.scc;vssver2.scc" />
 | 
			
		||||
    <extensionMap>
 | 
			
		||||
      <removed_mapping ext="csv" approved="true" type="CSV/TSV" />
 | 
			
		||||
      <mapping ext="csv" type="CSV" />
 | 
			
		||||
      <removed_mapping ext="tsv" type="CSV/TSV" />
 | 
			
		||||
      <removed_mapping ext="csv" type="CSV/TSV" />
 | 
			
		||||
      <mapping ext="tsv" type="TSV" />
 | 
			
		||||
      <mapping pattern="ArtifactDB" type="AUTO_DETECTED" />
 | 
			
		||||
      <mapping ext="mat" type="AUTO_DETECTED" />
 | 
			
		||||
      <removed_mapping ext="csv" approved="true" type="CSV" />
 | 
			
		||||
      <removed_mapping ext="ignore" approved="true" type="IgnoreLang file" />
 | 
			
		||||
      <removed_mapping ext="tsv" approved="true" type="CSV/TSV" />
 | 
			
		||||
      <removed_mapping ext="pdf" approved="true" type="Native" />
 | 
			
		||||
      <removed_mapping ext="tsv" approved="true" type="TSV" />
 | 
			
		||||
      <mapping ext=".model" 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="tabnine" type="Tabnine project model file" />
 | 
			
		||||
    </extensionMap>
 | 
			
		||||
  </component>
 | 
			
		||||
</application>
 | 
			
		||||
@ -2,5 +2,6 @@
 | 
			
		||||
  <component name="UISettings">
 | 
			
		||||
    <option name="MAX_LOOKUP_WIDTH2" value="1000" />
 | 
			
		||||
    <option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
 | 
			
		||||
    <option name="PRESENTATION_MODE_FONT_SIZE" value="36" />
 | 
			
		||||
  </component>
 | 
			
		||||
</application>
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user