alphagov/whitehall — comment on commit 7c51c6f595174877f919a43adc3033984780cc84
File:  line 0
By floehopper:

Sorry about the conflict markers in this commit - it should all be ok now. My only excuse was it was Friday afternoon.