tree a81385d3e2a5b2db0379e3a744583bb2ec439688
parent 2a535670144c8f0a635d32e99364c9353a260a6c
author Clint Byrum <clint@fewbar.com> 1493671283 -0700
committer Clint Byrum <clint@fewbar.com> 1493671424 -0700

Re-enable test_live_reconfiguration_merge_conflict

Straight forward test re-enablement.

Change-Id: I6753450b1b234845f0cb420a751fa43ac74eb980
Story: 2000773
Task: 4195