X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=a16551180b0a14c19df81f996af2473bcd2f6d7c;hp=a3d02088d1e9f309fbb7b82556443ee9fb76c467;hb=c7eb32b1b9582c298aba7213f4cb68b507b4248a;hpb=358eb11a499435f41d49ce4a5683c6428dcac750;ds=sidebyside

diff --git a/src/common/utils.c b/src/common/utils.c
index a3d02088d..a16551180 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1635,8 +1635,13 @@ gint scan_mailto_url(const gchar *mailto, gchar **from, gchar **to, gchar **cc,
 			*body = decode_uri_gdup(value);
 		} else if (body && !*body && !g_ascii_strcasecmp(field, "insert")) {
 			gchar *tmp = decode_uri_gdup(value);
+<<<<<<< utils.c
+			if (!g_file_get_contents(value, body, NULL, NULL)) {
+				g_warning("Error: couldn't set insert file '%s' in body\n", value);
+=======
 			if (!g_file_get_contents(tmp, body, NULL, NULL)) {
 				g_warning("Error: couldn't set insert file '%s' in body\n", value);
+>>>>>>> 1.36.2.176
 			}
 			g_free(tmp);
 			tmp = NULL;