mono/MonoGame — comment on commit e43532746feed47a53fcd56e8156dfdb04f79d30
File:  line 0
By slygamer:

Javier, did you intend to add the ContentManager.cs.orig that was created as part of a merge conflict? That file should not be added to the repos.