diff options
| author | Martin Baulig <martin@src.gnome.org> | 1999-02-28 19:26:02 +0800 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-02-28 19:26:02 +0800 |
| commit | 3567dff72453d676f086cbab86d396f84ff9ea24 (patch) | |
| tree | 552b657e984e360faf9acd940cab1c982c2a0692 /calendar/main.c | |
| parent | 43a26581b2bcf303134d67fa61f7edc04ce55bcd (diff) | |
| download | gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.gz gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.bz2 gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.lz gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.xz gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.tar.zst gsoc2013-evolution-3567dff72453d676f086cbab86d396f84ff9ea24.zip | |
Remove a CVS conflict marker.
svn path=/trunk/; revision=709
Diffstat (limited to 'calendar/main.c')
0 files changed, 0 insertions, 0 deletions