aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/calendar-component.c
diff options
context:
space:
mode:
authorLarry Ewing <lewing@src.gnome.org>2003-12-02 08:20:43 +0800
committerLarry Ewing <lewing@src.gnome.org>2003-12-02 08:20:43 +0800
commit9b2e5956080b08da3611996c7f12158fcfe3e06d (patch)
tree33315c5e28d32842a437cac25dd90bb4f00e9efa /calendar/gui/calendar-component.c
parent7eb86e42c84b8ba14b0b357fdaa94a6454d0f5d7 (diff)
downloadgsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.gz
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.tar.zst
gsoc2013-evolution-9b2e5956080b08da3611996c7f12158fcfe3e06d.zip
remove stray conflict marker
svn path=/trunk/; revision=23554
Diffstat (limited to 'calendar/gui/calendar-component.c')
0 files changed, 0 insertions, 0 deletions