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

Conflicts:
	filetypes.xml
This commit is contained in:
Rohit Pai 2022-03-26 18:03:06 +00:00
commit 30f8bf3c14
3 changed files with 9 additions and 11 deletions

View File

@ -4,16 +4,15 @@
<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="db" type="AUTO_DETECTED" />
<mapping ext=".tabnine.model" type="Tabnine project model file" />
<mapping ext=".tabnine" type="Tabnine project model file" />
<mapping ext=".model" type="Tabnine project model file" />
<mapping ext="tabnine" 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" />
<removed_mapping ext="pdf" approved="true" type="Native" /> <removed_mapping ext="pdf" approved="true" type="Native" />
<removed_mapping ext="tsv" approved="true" type="TSV" /> <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> </extensionMap>
</component> </component>
</application> </application>

View File

@ -1,10 +1,8 @@
<application> <application>
<component name="FindSettings"> <component name="FindSettings">
<option name="customScope" value="All Places" /> <option name="customScope" value="Directory 'Scripts'" />
<option name="defaultScopeName" value="All Places" /> <option name="defaultScopeName" value="Directory 'Scripts'" />
<option name="wholeWordsOnly" value="true" /> <option name="SEARCH_SCOPE" value="Directory 'Scripts'" />
<option name="WHOLE_WORDS_ONLY" value="true" />
<option name="SEARCH_SCOPE" value="All Places" />
<mask>*.css</mask> <mask>*.css</mask>
<mask>*.html</mask> <mask>*.html</mask>
<mask>*.xml</mask> <mask>*.xml</mask>

View File

@ -19,6 +19,7 @@
<option name="cloneParentDir" value="$USER_HOME$/Documents/My Projects/React Nanodegree" /> <option name="cloneParentDir" value="$USER_HOME$/Documents/My Projects/React Nanodegree" />
</component> </component>
<component name="Vcs.Log.App.Settings"> <component name="Vcs.Log.App.Settings">
<option name="SHOW_CHANGES_FROM_PARENTS" value="true" />
<option name="COLUMN_ID_ORDER"> <option name="COLUMN_ID_ORDER">
<list> <list>
<option value="Default.Root" /> <option value="Default.Root" />