y-trudeau/resource-agents — comment on commit 17c7c338cc15a388f6ba207c581816751cb8748a
File:  line 0
By raoulbhatia:

i did a quick diff of your master ra and my master ra and i think that the merging went wrong.
quite possibly because of your heavy beautification.

now, i propose the following: i'll check your original code, will fetch your diffs, beautify them and apply them in your name.
sounds like a lot of work - but at least i can understand how git will handle this ;)