xiaoyan159/RealmTest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 合并冲突

Browse Source
This commit is contained in:
xiaoyan
2022-12-27 16:33:25 +08:00
parent ea692d190b e4f8cd1949
commit acbc7c957b
23 changed files with 536 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/misc.xml generated
View File

@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<<<<<<< HEAD
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
>>>>>>> e4f8cd19496660f3dc11140134950097331d4957
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">