• Antonius's avatar
    Merge remote-tracking branch 'origin/master' · 16d22b4d
    Antonius authored
    # Conflicts:
    #	.gradle/4.6/fileContent/fileContent.lock
    #	.gradle/4.6/fileHashes/fileHashes.bin
    #	.gradle/4.6/fileHashes/fileHashes.lock
    #	.gradle/4.6/javaCompile/classAnalysis.bin
    #	.gradle/4.6/javaCompile/javaCompile.lock
    #	.gradle/4.6/javaCompile/taskHistory.bin
    #	.gradle/4.6/taskHistory/taskHistory.bin
    #	.gradle/4.6/taskHistory/taskHistory.lock
    #	.gradle/buildOutputCleanup/buildOutputCleanup.lock
    #	.idea/caches/build_file_checksums.ser
    #	.idea/workspace.xml
    #	app/build/intermediates/blame/res/debug/single/anim.json
    #	app/build/intermediates/blame/res/debug/single/drawable-hdpi-v4.json
    #	app/build/intermediates/blame/res/debug/single/drawable-mdpi-v4.json
    #	app/build/intermediates/blame/res/debug/single/drawable-xhdpi-v4.json
    #	app/build/intermediates/blame/res/debug/single/drawable-xxhdpi-v4.json
    #	app/build/intermediates/blame/res/debug/single/drawable-xxxhdpi-v4.json
    #	app/build/intermediates/blame/res/debug/single/xml.json
    #	app/build/intermediates/classes/debug/id/co/visionet/crm_multibank/activity/DetailIncident$26$1.class
    #	app/build/intermediates/classes/debug/id/co/visionet/crm_multibank/activity/DetailIncident$26$2.class
    #	app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
    #	app/build/intermediates/incremental/debug-mergeJniLibs/merge-state
    #	app/build/intermediates/incremental/packageDebug/debug/zip-cache/k_gwmuYC35f4_3eHfW7T1N0XhqM=
    #	app/build/intermediates/transforms/RealmTransformer/debug/0/id/co/visionet/crm_multibank/activity/DetailIncident$26$1.class
    #	app/build/intermediates/transforms/RealmTransformer/debug/0/id/co/visionet/crm_multibank/activity/DetailIncident$26$2.class
    #	app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
    #	app/src/main/java/id/co/visionet/crm_multibank/activity/DetailIncident.java
    #	app/src/main/java/id/co/visionet/crm_multibank/activity/DetailRollout.java
    16d22b4d
Name
Last commit
Last update
..
buildOutputCleanup.lock Loading commit data...
cache.properties Loading commit data...
outputFiles.bin Loading commit data...