The end of the conflict (for now) is not as spectacular as commentators in january seemed to expect. But reading their blogpost http://googleblog.blogspot.com/2010/01/new-approach-to-china.html, I notice google didn't make any extreme claims anyway, and their post ended with "We are committed to working responsibly to resolve the very difficult issues raised."
Google compromises, gets license renewal in China
washingtonpost.com