guardian/frontend — pull request #4106 by kelvin-chappell (2014-05-06 14:26:22+00:00)
Title: Resolve Merge Conflicts in Admin Assembly

DFP API transitive dependencies introduce different versions of classes to the classpath.
So using MergeStrategy.first to choose the first version that appears on the classpath.