diff -r 57bba1532346 -r ca5974e057ae pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Thu Apr 26 19:02:11 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Apr 26 19:54:19 2007 +0000
@@ -241,22 +241,10 @@
 	char *icon_path;
 	int i;
 	const char *icon_sizes[] = {
-<<<<<<< variant A
-		"16x16",
-		"24x24",
-		"32x24",
-		"48x48"
->>>>>>> variant B
 		"16x16",
 		"24x24",
 		"32x32",
 		"48x48"
-####### Ancestor
-		"16",
-		"24",
-		"32",
-		"48"
-======= end
 	};
 
 #endif
@@ -268,13 +256,7 @@
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
 	for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
-<<<<<<< variant A
 		icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
->>>>>>> variant B
-		icon_path = g_build_filename(DATADIR, "pixmaps", "icons", "hicolor", icon_sizes[i], "apps", "pidgin.png", NULL);
-####### Ancestor
-		icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", icon_sizes[i], "pidgin.png", NULL);
-======= end
 		icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 		g_free(icon_path);
 		if (icon) {