<<<<<<< HEAD net.micode.notes.app-pngs-0 D:\software gongcheng\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-1 D:\software gongcheng\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-packageDebugResources-2 D:\software gongcheng\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir net.micode.notes.app-packageDebugResources-3 D:\software gongcheng\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir net.micode.notes.app-merged_res-4 D:\software gongcheng\Notes-master\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-5 D:\software gongcheng\Notes-master\app\src\debug\res net.micode.notes.app-main-6 D:\software gongcheng\Notes-master\app\src\main\res ======= net.micode.notes.app-pngs-0 D:\GITwork\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-resValues-1 D:\GITwork\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-packageDebugResources-2 D:\GITwork\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir net.micode.notes.app-packageDebugResources-3 D:\GITwork\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir net.micode.notes.app-merged_res-4 D:\GITwork\Notes-master\app\build\intermediates\merged_res\debug net.micode.notes.app-debug-5 D:\GITwork\Notes-master\app\src\debug\res net.micode.notes.app-main-6 D:\GITwork\Notes-master\app\src\main\res >>>>>>> develop