Simply conflict detection by removing nested if statements
authorDavid Stainton <dstainton415@gmail.com>
Wed, 4 Nov 2015 11:27:31 +0000 (12:27 +0100)
committerDaira Hopwood <daira@jacaranda.org>
Mon, 25 Jan 2016 15:52:14 +0000 (15:52 +0000)
commit238a26aca539e3e6888448a2ea706f733de52e12
treec304f2ec096ea114656cd6173d539d679ad9bfdb
parentd26d395d1255a221e1449aa2f1f14a5117e45a7b
Simply conflict detection by removing nested if statements
src/allmydata/frontends/magic_folder.py