Fix conflicts
authorDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Mon, 25 Jan 2010 14:35:39 +0000 (15:35 +0100)
committerDariusz Mikulski <dariusz.mikulski@collabora.co.uk>
Mon, 25 Jan 2010 14:35:39 +0000 (15:35 +0100)
commit85c238d243b027dc20deeded6b495e496f28ce45
treea0eb976882cce84d11b8cbbafc8bc328bf209277
parent901e88f3d528e18ffdb723c54124cc660598a5fd
parent402939f3c8272845fad265080e2b7be2ad39cd84
Fix conflicts
Makefile.am
src/telepathy/tpaccountitem.cc
src/telepathy/tpaccountitem.h
src/telepathy/tpaccountmanager.cc