Conflicts: colors/TheoryOfNekomata.icls colors/_@user_Darcula.iclsmaster
@@ -2,5 +2,6 @@ | |||||
<component name="CodeGlance Pro"> | <component name="CodeGlance Pro"> | ||||
<option name="clickType" value="MOUSE_POSITION" /> | <option name="clickType" value="MOUSE_POSITION" /> | ||||
<option name="pixelsPerLine" value="3" /> | <option name="pixelsPerLine" value="3" /> | ||||
<option name="width" value="130" /> | |||||
</component> | </component> | ||||
</application> | </application> |
@@ -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-14T11:00:44</property> | |||||
<property name="modified">2023-03-14T10:30:41</property> | |||||
<property name="originalScheme">TheoryOfNekomata</property> | <property name="originalScheme">TheoryOfNekomata</property> | ||||
</metaInfo> | </metaInfo> | ||||
<console-font> | <console-font> | ||||
@@ -1,15 +1,16 @@ | |||||
<scheme name="_@user_Darcula" version="142" parent_scheme="Darcula"> | <scheme name="_@user_Darcula" version="142" parent_scheme="Darcula"> | ||||
<metaInfo> | <metaInfo> | ||||
<property name="created">2023-03-06T19:41:54</property> | |||||
<property name="ide">WebStorm</property> | |||||
<property name="created">2023-03-14T10:29:57</property> | |||||
<property name="ide">CLion</property> | |||||
<property name="ideVersion">2022.3.2.0.0</property> | <property name="ideVersion">2022.3.2.0.0</property> | ||||
<property name="modified">2023-03-14T11:00:44</property> | |||||
<property name="modified">2023-03-14T10:30:41</property> | |||||
<property name="originalScheme">Darcula</property> | <property name="originalScheme">Darcula</property> | ||||
</metaInfo> | </metaInfo> | ||||
<colors> | <colors> | ||||
<option name="FILESTATUS_ADDED" value="c3e887" /> | <option name="FILESTATUS_ADDED" value="c3e887" /> | ||||
<option name="FILESTATUS_DELETED" value="f77669" /> | <option name="FILESTATUS_DELETED" value="f77669" /> | ||||
<option name="FILESTATUS_HIJACKED" value="ffcb6b" /> | <option name="FILESTATUS_HIJACKED" value="ffcb6b" /> | ||||
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="cccccc" /> | |||||
<option name="FILESTATUS_MODIFIED" value="eac651" /> | <option name="FILESTATUS_MODIFIED" value="eac651" /> | ||||
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" /> | <option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" /> | ||||
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" /> | <option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" /> | ||||
@@ -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">2023-03-06T19:40:44</property> | |||||
<property name="ide">CLion</property> | |||||
<property name="created">2023-03-08T09:10:47</property> | |||||
<property name="ide">WebStorm</property> | |||||
<property name="ideVersion">2022.3.2.0.0</property> | <property name="ideVersion">2022.3.2.0.0</property> | ||||
<property name="modified">2023-03-06T19:42:16</property> | |||||
<property name="modified">2023-03-14T10:30:41</property> | |||||
<property name="originalScheme">Default</property> | <property name="originalScheme">Default</property> | ||||
</metaInfo> | </metaInfo> | ||||
<colors> | <colors> | ||||
@@ -15,6 +15,7 @@ | |||||
<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="cccccc" /> | |||||
<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" /> | ||||
@@ -1,5 +1,5 @@ | |||||
<application> | <application> | ||||
<component name="CsvEditorSettings"> | <component name="CsvEditorSettings"> | ||||
<option name="CURRENT_PLUGIN_VERSION" value="3.0.3-223" /> | |||||
<option name="CURRENT_PLUGIN_VERSION" value="3.1.0-223" /> | |||||
</component> | </component> | ||||
</application> | </application> |