diff options
| author | Iain Holmes <iain@src.gnome.org> | 2000-12-22 08:12:56 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2000-12-22 08:12:56 +0800 |
| commit | 6ab7d29c180e2f15da9a0ae1778a29db3715aa4b (patch) | |
| tree | 21981a4550dd1a698854705e523e91400c3d30d0 | |
| parent | 46c9ba67664e8d8e52d7b6d0841d17d8d779ea64 (diff) | |
| download | gsoc2013-evolution-6ab7d29c180e2f15da9a0ae1778a29db3715aa4b.tar.gz gsoc2013-evolution-6ab7d29c180e2f15da9a0ae1778a29db3715aa4b.tar.zst gsoc2013-evolution-6ab7d29c180e2f15da9a0ae1778a29db3715aa4b.zip | |
removed conflict indicators
svn path=/trunk/; revision=7124
| -rw-r--r-- | calendar/gui/event-editor-dialog.glade.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h index 015c62c534..f255687a6d 100644 --- a/calendar/gui/event-editor-dialog.glade.h +++ b/calendar/gui/event-editor-dialog.glade.h @@ -35,21 +35,14 @@ gchar *s = N_("_End time:"); gchar *s = N_("_Mail"); gchar *s = N_("_Program"); gchar *s = N_("_Run program:"); -<<<<<<< event-editor-dialog.glade.h -gchar *s = N_("_Start time:"); -======= gchar *s = N_("_Audio"); gchar *s = N_("Reminder"); gchar *s = N_("Appointment Basics"); gchar *s = N_("Su_mmary:"); ->>>>>>> 1.9 gchar *s = N_("_Starting date:"); gchar *s = N_("event-editor-dialog"); gchar *s = N_("label21"); gchar *s = N_("month(s)"); -<<<<<<< event-editor-dialog.glade.h -gchar *s = N_("th day of the month"); -======= gchar *s = N_("year(s)"); gchar *s = N_("for"); gchar *s = N_("until"); @@ -61,4 +54,3 @@ gchar *s = N_("Delete"); gchar *s = N_("label21"); gchar *s = N_("Preview"); gchar *s = N_("Recurrence"); ->>>>>>> 1.11 |