diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-11 08:37:05 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-11 08:37:05 +0800 |
| commit | 592a45a9c07d92648ca2e791fa04e23ebd1afe62 (patch) | |
| tree | 972fd230991f88db37a6164e96add3f8f0a0b2dd /shell/ChangeLog | |
| parent | cc233e954b5fe6be038ceb3e0239158bff74e3b3 (diff) | |
| download | gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.gz gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.zst gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.zip | |
Remove conflict marks.
svn path=/trunk/; revision=4081
Diffstat (limited to 'shell/ChangeLog')
0 files changed, 0 insertions, 0 deletions