Show of Hands

Would Christian God more likely allow someone in heaven if they were by all means a good person but an atheist, or by all means a good person but believed in a different God in another religion?