fix conflict
authorTanya <tanya@bookdmitri.oblgaz>
Sun, 4 Apr 2010 19:44:58 +0000 (22:44 +0300)
committerTanya <tanya@bookdmitri.oblgaz>
Sun, 4 Apr 2010 19:44:58 +0000 (22:44 +0300)
commit0a6230fd78912936656214fb20cfd9463fbaf5a1
tree669360582ecbd70950c95bdd5f3905442954d7ad
parentfbd614c280ca18b584fd412f227576b1b82ade49
parent79f7afff0cebb924db38cd9ca99045f832fcd912
fix conflict
applet/src/livewp-home-widget.c