fix conflict
authorTanya <tanya@bookdmitri.oblgaz>
Sun, 4 Apr 2010 19:48:44 +0000 (22:48 +0300)
committerTanya <tanya@bookdmitri.oblgaz>
Sun, 4 Apr 2010 19:48:44 +0000 (22:48 +0300)
commit7b417c7280d49c281d2438627dd5bb34f4b1d9b7
tree818cf92b57a352ea62aa99a4b3302132b215d4bf
parent0a6230fd78912936656214fb20cfd9463fbaf5a1
fix conflict
applet/src/livewp-home-widget.c