juju/juju-gui — pull request #584 by hatched (2014-09-24 17:20:53+00:00)
Title: Hook up the conflict UI to the new _conflictedFields attribute

The changes to the config attribute interactions made the previous databinding conflict code no longer functional. This switches it over to use the new `_conflictedFields` attribute while using as much of the same databinding and conflict architecture as possible because of the time constraint.