diff options
Diffstat (limited to 'mail/em-format-html.h')
| -rw-r--r-- | mail/em-format-html.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 23e0057f89..d35556316a 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -209,11 +209,6 @@ struct _EMFormatHTML { EMFormat parent; EMFormatHTMLPrivate *priv; -<<<<<<< HEAD:mail/em-format-html.h -======= - EMFormatHTMLPrivate *priv; - ->>>>>>> master:mail/em-format-html.h GtkHTML *html; EDList pending_object_list; |