Skip to content

A
android_fiveworld
Commit e933c490 authored by fengruiyu's avatar fengruiyu
Browse files
Options

Merge branch 'fry_dev' of http://39.97.65.143:81/android/android_street into fry_dev 

 Conflicts:
	library_base/version.properties
parents a0f71f23 d19fd627
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
.gitignore
View file @ e933c490
*.iml *.iml
*.log
.gradle .gradle
/local.properties /local.properties
/.idea /.idea
......
.idea/misc.xml
View file @ e933c490
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment