aboutsummaryrefslogtreecommitdiffstats
path: root/shell/ChangeLog
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@src.gnome.org>2000-10-03 07:31:29 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-10-03 07:31:29 +0800
commitf5394d001ea69f0d6a5660c6744580275ebbf9c3 (patch)
tree3cd49dc40bb129f08f52191d687f399fec97dee2 /shell/ChangeLog
parentafc127193137188d4efc11194698a2b22f138f75 (diff)
downloadgsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.gz
gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.tar.zst
gsoc2013-evolution-f5394d001ea69f0d6a5660c6744580275ebbf9c3.zip
remove spurious conflict indicator.
svn path=/trunk/; revision=5679
Diffstat (limited to 'shell/ChangeLog')
0 files changed, 0 insertions, 0 deletions