Преглед на файлове

CL-2022.3.2 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	colors/TheoryOfNekomata.icls
	colors/_@user_Darcula.icls
master
TheoryOfNekomata преди 1 година
родител
ревизия
d053390e99
променени са 3 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. +2
    -2
      colors/TheoryOfNekomata.icls
  2. Двоични данни
      colors/_@user_Darcula.icls
  3. +3
    -4
      colors/_@user_Default.icls

+ 2
- 2
colors/TheoryOfNekomata.icls Целия файл

@@ -4,7 +4,7 @@
<property name="created">2023-02-23T14:55:53</property>
<property name="ide">WebStorm</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>
</metaInfo>
<console-font>
@@ -941,4 +941,4 @@
</value>
</option>
</attributes>
</scheme>
</scheme>

Двоични данни
colors/_@user_Darcula.icls Целия файл


+ 3
- 4
colors/_@user_Default.icls Целия файл

@@ -1,9 +1,9 @@
<scheme name="_@user_Default" version="142" parent_scheme="Default">
<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="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>
</metaInfo>
<colors>
@@ -15,7 +15,6 @@
<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_PROPERTY_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" />
<option name="FILESTATUS_MERGED" value="9876aa" />
<option name="FILESTATUS_MODIFIED" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />


Зареждане…
Отказ
Запис