WS-2021.1.1 <martin@Stolas Merge branch 'master'

This commit is contained in:
Martin Donnelly 2021-05-11 23:47:35 +01:00
commit 94c36c5226
3 changed files with 13 additions and 25 deletions

View File

@ -1,5 +1,6 @@
<application> <application>
<component name="BaseRefactoringSettings"> <component name="BaseRefactoringSettings">
<option name="SAFE_DELETE_WHEN_DELETE" value="false" />
<option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" /> <option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" />
<option name="RENAME_SEARCH_FOR_TEXT_FOR_FILE" value="false" /> <option name="RENAME_SEARCH_FOR_TEXT_FOR_FILE" value="false" />
<option name="RENAME_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" /> <option name="RENAME_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />

View File

@ -4,13 +4,13 @@
<property name="created">2020-02-15T17:42:07</property> <property name="created">2020-02-15T17:42:07</property>
<property name="ide">WebStorm</property> <property name="ide">WebStorm</property>
<property name="ideVersion">2019.3.2.0.0</property> <property name="ideVersion">2019.3.2.0.0</property>
<property name="modified">2021-04-07T10:17:49</property> <property name="modified">2021-05-06T13:27:57</property>
<property name="originalScheme">Monokai copy</property> <property name="originalScheme">Monokai copy</property>
</metaInfo> </metaInfo>
<option name="LINE_SPACING" value="1.0" /> <option name="LINE_SPACING" value="1.0" />
<font> <font>
<option name="EDITOR_FONT_NAME" value="Fira Code" /> <option name="EDITOR_FONT_NAME" value="Fira Code" />
<option name="EDITOR_FONT_SIZE" value="16" /> <option name="EDITOR_FONT_SIZE" value="14" />
</font> </font>
<font> <font>
<option name="EDITOR_FONT_NAME" value="Fira Code Light" /> <option name="EDITOR_FONT_NAME" value="Fira Code Light" />
@ -425,7 +425,8 @@
</option> </option>
<option name="DEFAULT_BLOCK_COMMENT"> <option name="DEFAULT_BLOCK_COMMENT">
<value> <value>
<option name="FOREGROUND" value="98999a" /> <option name="FOREGROUND" value="ffff00" />
<option name="BACKGROUND" value="800080" />
</value> </value>
</option> </option>
<option name="DEFAULT_BRACES"> <option name="DEFAULT_BRACES">
@ -500,7 +501,8 @@
</option> </option>
<option name="DEFAULT_LINE_COMMENT"> <option name="DEFAULT_LINE_COMMENT">
<value> <value>
<option name="FOREGROUND" value="999999" /> <option name="FOREGROUND" value="ffff00" />
<option name="BACKGROUND" value="800080" />
</value> </value>
</option> </option>
<option name="DEFAULT_LOCAL_VARIABLE"> <option name="DEFAULT_LOCAL_VARIABLE">
@ -944,8 +946,8 @@
</option> </option>
<option name="NOT_USED_ELEMENT_ATTRIBUTES"> <option name="NOT_USED_ELEMENT_ATTRIBUTES">
<value> <value>
<option name="FOREGROUND" value="fffe07" /> <option name="FOREGROUND" value="ecf56c" />
<option name="BACKGROUND" value="ff0200" /> <option name="BACKGROUND" value="8a0100" />
</value> </value>
</option> </option>
<option name="OC.BADCHARACTER"> <option name="OC.BADCHARACTER">

View File

@ -4,15 +4,6 @@
<entry key="ChangesView"> <entry key="ChangesView">
<PlaceSettings /> <PlaceSettings />
</entry> </entry>
<entry key="CommitDialog">
<PlaceSettings />
</entry>
<entry key="Default">
<PlaceSettings />
</entry>
<entry key="TestsFiledAssertions">
<PlaceSettings />
</entry>
</option> </option>
</component> </component>
<component name="TextDiffSettings"> <component name="TextDiffSettings">
@ -22,21 +13,15 @@
<option name="EXPAND_BY_DEFAULT" value="false" /> <option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings> </PlaceSettings>
</entry> </entry>
<entry key="CommitDialog">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings>
</entry>
<entry key="Default"> <entry key="Default">
<PlaceSettings> <PlaceSettings>
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" /> <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
</PlaceSettings> </PlaceSettings>
</entry> </entry>
<entry key="Merge"> <entry key="DirDiff">
<PlaceSettings /> <PlaceSettings>
</entry> <option name="IGNORE_POLICY" value="IGNORE_WHITESPACES_CHUNKS" />
<entry key="TestsFiledAssertions"> </PlaceSettings>
<PlaceSettings />
</entry> </entry>
</option> </option>
</component> </component>