merge

2019-10-12 08:06:21 +08:00 · 2019-10-12 08:06:21 +08:00 · dbaca882d5
parent ff3f6c1881
commit dbaca882d5
6 changed files with 1 additions and 1 deletions
--- a/src/.gradle/5.4.1/executionHistory/executionHistory.lock
+++ b/src/.gradle/5.4.1/executionHistory/executionHistory.lock
--- a/src/.gradle/5.4.1/fileHashes/fileHashes.lock
+++ b/src/.gradle/5.4.1/fileHashes/fileHashes.lock
--- a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/.idea/caches/build_file_checksums.ser
+++ b/src/.idea/caches/build_file_checksums.ser
--- a/src/.idea/caches/gradle_models.ser
+++ b/src/.idea/caches/gradle_models.ser
--- a/src/.idea/workspace.xml
+++ b/src/.idea/workspace.xml
@ -105,7 +105,7 @@
      </list>
    </option>
  </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="85" />
    <option name="y" value="25" />
    <option name="width" value="1750" />