ConflictsScreen: Only finish current activity when all conflicts resolved#142

chenxiaolong merged 1 commit into

masterchenxiaolong/BasicSync:masterfrom

conflictschenxiaolong/BasicSync:conflictsCopy head branch name to clipboard