合并分支

8 years ago · 41e082ad29
parent da041a0114
commit 41e082ad29
1 changed files with 3 additions and 0 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
  <component name="NullableNotNullManager">
    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />