Mercurial > pidgin
diff .mtn-ignore @ 20413:fd7b501cc9c8
fix up broken merge
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 56c61eb40850 |
children | f6de19624575 ecf5bf6daa78 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Sat, 12 May 2007 19:35:18 +0000 |
parents | 56c61eb40850 |
children | f6de19624575 ecf5bf6daa78 |