Merge branch 'master' of https://vcs.maemo.org/git/livewp

[livewp] / applet / src / livewp-settings.c

diff --git a/applet/src/livewp-settings.c b/applet/src/livewp-settings.c
index 93e88af..bcede27 100644 (file)
--- a/applet/src/livewp-settings.c
+++ b/applet/src/livewp-settings.c
@@ -34,7 +34,11 @@ void lw_about(void){
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     vbox = gtk_vbox_new (FALSE, 5);
+<<<<<<< HEAD
     label_about = gtk_label_new (_("Live Wallpaper Version 0.8.5 \n Copyright(c) 2010\n \
+=======
+    label_about = gtk_label_new (_("Live Wallpaper Version 0.8.2 \n Copyright(c) 2010\n \
+>>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
 Tanya Makova\n Vlad Vasiliev\n \
 Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
 Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \