|
|
|
|
@ -10,6 +10,7 @@
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="2531eea7-ec98-43ef-9f7f-09fe1004db56" name="变更" comment="庞浩的注释">
|
|
|
|
|
<<<<<<< remotes/origin/cyx_branch
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/checksums.lock" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/md5-checksums.bin" afterDir="false" />
|
|
|
|
|
<change afterPath="$PROJECT_DIR$/src/.gradle/7.4.2/checksums/sha1-checksums.bin" afterDir="false" />
|
|
|
|
|
@ -81,6 +82,9 @@
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/minote.iml" beforeDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" />
|
|
|
|
|
=======
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
>>>>>>> local
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
|
