From e0e4a236e5deb2c1009dfc62ed0e78207b542767 Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Fri, 7 Sep 2001 18:44:38 +0000
Subject: Don't allow the default toolbar to be configurable.

* evolution.xml: Don't allow the default toolbar to be
configurable.

svn path=/trunk/; revision=12676
---
 ui/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 1f9c34983b..3c33bc1597 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -33,7 +33,6 @@
 	Ctrl-Shift-Y so we are more like O* and don't get in the way of
 	the Ctrl-Shift-C for "New Contact".
 
->>>>>>> 1.245
 2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution-mail-global.xml: Add an F9 accelerator for the
-- 
cgit v1.2.3