morphlingdev/Morphling — comment on commit 639d7eeb4edb49932964eb78943c2c1f938632a9
File:  line 0
By Neynt:

Yeah, apparently. It might be because your commit was made in the time between my last pull and my most recent commit, so merging had to be done.

Oh well, still compiles, still runs.