7b46fdc ensure we check at least one conflict candidate from the repos

Authored and Committed by Dan Callaghan 6 years ago
    ensure we check at least one conflict candidate from the repos
    
    Bug: 1502458
    Change-Id: Ic359b9fa32b510bbdc56c07d3389a29028cbb41d
    
        
file modified
+19 -7