Mercurial > pidgin
diff ChangeLog @ 18685:c03e3fe11ea9
Fixed errors created by merge conflict resolve mistakes.
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Wed, 11 Jul 2007 23:27:12 +0000 |
| parents | 24ecab0d40b3 |
| children | 70c758256110 |
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Wed, 11 Jul 2007 23:27:12 +0000 |
| parents | 24ecab0d40b3 |
| children | 70c758256110 |