aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-07-14 01:03:12 +0800
committerChristian Persch <chpe@src.gnome.org>2007-07-14 01:03:12 +0800
commit731508e8e2d5203475de05d9cec258a5033410df (patch)
tree03b3cf259ae938c68d5e9f8a844b469afd19d766 /ChangeLog
parenta00a43493616ac39e72fdd64e94742a14bee513b (diff)
downloadgsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar.gz
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar.bz2
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar.lz
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar.xz
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.tar.zst
gsoc2013-epiphany-731508e8e2d5203475de05d9cec258a5033410df.zip
remove conflict marker
svn path=/trunk/; revision=7156
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b69cb84ef..362c5ce48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,6 @@
Use the right prefs to disable CUPS.
->>>>>>> .r7150
2007-07-11 Luca Ferretti <elle.uca@libero.it>
* data/chrome/about.xhtml: