ziji Wu 69f50c78dd 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/5.4.1/fileHashes/resourceHashesCache.bin # src/.gradle/5.4.1/javaCompile/javaCompile.lock # src/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/.gradle/buildOutputCleanup/outputFiles.bin # src/.idea/caches/build_file_checksums.ser # src/.idea/caches/gradle_models.ser # src/.idea/sonarlint/issuestore/1/e/1eb2363b523dbcae43d3c6e4790c64436af61b13 # src/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 # src/.idea/sonarlint/issuestore/5/7/577f30d26378ec8a2bd2e4a43f3c79b3f04c402c # src/.idea/sonarlint/issuestore/6/a/6a65e747031f27aef20597b4181148a9fbf963d5 # src/.idea/sonarlint/issuestore/a/7/a7641cfac724321d508c2a284223a711011a93f5 # src/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 # src/.idea/sonarlint/issuestore/d/d/dd970bd8ce083850fca1d4d159647ccd110e57cb # src/.idea/workspace.xml # src/app/app.iml # src/app/build.gradle # src/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex # src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/dPcwR9oS2EmiImbvDZ1Qg_iwk3M= # src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class # src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class # src/app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_ # src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesDatabaseHelper.dex # src/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/NotesProvider.dex # src/app/build/outputs/apk/debug/app-debug.apk # src/app/src/main/java/net/micode/notes/data/NotesProvider.java		2019-10-12 00:20:00 +08:00
.gradle	1	2019-10-01 02:02:51 +08:00
.idea	1	2019-10-11 21:16:47 +08:00
app	1	2019-10-11 23:51:57 +08:00
doc	pdf版	2019-10-07 12:19:02 +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-12 00:20:00 +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