diff options
Diffstat (limited to 'mail/em-format-html.h')
| -rw-r--r-- | mail/em-format-html.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mail/em-format-html.h b/mail/em-format-html.h index d35556316a..23e0057f89 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -209,6 +209,11 @@ 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; |