Browse Source
CL-2022.3.2 <TheoryOfNekomata@VALHALLA Merge branch 'master'
Conflicts: colors/TheoryOfNekomata.icls colors/_@user_Darcula.iclsmaster
3 changed files with 5 additions and 6 deletions
Unified View
Diff Options
+ 2
- 2
colors/TheoryOfNekomata.icls
View File
| @@ -4,7 +4,7 @@ | |||||
| <property name="created">2023-02-23T14:55:53</property> | <property name="created">2023-02-23T14:55:53</property> | ||||
| <property name="ide">WebStorm</property> | <property name="ide">WebStorm</property> | ||||
| <property name="ideVersion">2022.3.1.0.0</property> | <property name="ideVersion">2022.3.1.0.0</property> | ||||
| <property name="modified">2023-03-06T13:47:26</property> | |||||
| <property name="modified">2023-03-08T12:30:06</property> | |||||
| <property name="originalScheme">TheoryOfNekomata</property> | <property name="originalScheme">TheoryOfNekomata</property> | ||||
| </metaInfo> | </metaInfo> | ||||
| <console-font> | <console-font> | ||||
| @@ -941,4 +941,4 @@ | |||||
| </value> | </value> | ||||
| </option> | </option> | ||||
| </attributes> | </attributes> | ||||
| </scheme> | |||||
| </scheme> | |||||
BIN
colors/_@user_Darcula.icls
View File
+ 3
- 4
colors/_@user_Default.icls
View File
| @@ -1,9 +1,9 @@ | |||||
| <scheme name="_@user_Default" version="142" parent_scheme="Default"> | <scheme name="_@user_Default" version="142" parent_scheme="Default"> | ||||
| <metaInfo> | <metaInfo> | ||||
| <property name="created">2019-08-26T12:03:47</property> | |||||
| <property name="created">2023-03-08T09:10:47</property> | |||||
| <property name="ide">WebStorm</property> | <property name="ide">WebStorm</property> | ||||
| <property name="ideVersion">2019.2.1.0.0</property> | |||||
| <property name="modified">2023-02-27T18:11:39</property> | |||||
| <property name="ideVersion">2022.3.2.0.0</property> | |||||
| <property name="modified">2023-03-08T12:30:06</property> | |||||
| <property name="originalScheme">Default</property> | <property name="originalScheme">Default</property> | ||||
| </metaInfo> | </metaInfo> | ||||
| <colors> | <colors> | ||||
| @@ -15,7 +15,6 @@ | |||||
| <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="d5756c" /> | <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="d5756c" /> | ||||
| <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="d5756c" /> | <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="d5756c" /> | ||||
| <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="d5756c" /> | <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="d5756c" /> | ||||
| <option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" /> | |||||
| <option name="FILESTATUS_MERGED" value="9876aa" /> | <option name="FILESTATUS_MERGED" value="9876aa" /> | ||||
| <option name="FILESTATUS_MODIFIED" value="80cbc4" /> | <option name="FILESTATUS_MODIFIED" value="80cbc4" /> | ||||
| <option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" /> | <option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" /> | ||||