ziji Wu 6c7336cf57 Merge remote-tracking branch 'origin/ziji_wu' into develop ... # Conflicts: # src/.gradle/5.4.1/executionHistory/executionHistory.bin # src/.gradle/5.4.1/executionHistory/executionHistory.lock # src/.gradle/5.4.1/fileHashes/fileHashes.bin # src/.gradle/5.4.1/fileHashes/fileHashes.lock # src/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/.idea/workspace.xml # src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java		2019-10-11 23:50:17 +08:00
.gradle	1	2019-10-01 02:02:51 +08:00
.idea	1	2019-10-08 20:02:48 +08:00
app	1	2019-10-08 20:02:48 +08:00
gradle/wrapper	m	2019-09-12 15:30:44 +08:00
src	Merge remote-tracking branch 'origin/ziji_wu' into develop	2019-10-11 23:50:17 +08:00
Notes-master.iml	mi	2019-09-22 08:37:56 +08:00
build.gradle	m	2019-09-12 15:30:44 +08:00
gradlew	m	2019-09-12 15:30:44 +08:00
gradlew.bat	m	2019-09-12 15:30:44 +08:00
import-summary.txt	m	2019-09-12 15:30:44 +08:00
local.properties	1	2019-10-01 02:02:51 +08:00
settings.gradle	1	2019-10-01 02:02:51 +08:00
sonar-project.properties	m	2019-09-12 15:30:44 +08:00