diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-29 09:53:06 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-29 09:53:06 +0800 |
| commit | 75741e52c3431a8fa16ed535329fb76cb2840100 (patch) | |
| tree | 2e09d5f2ccd1008866355865e09bda4bb75f725a /mail | |
| parent | 9192f0dc883acfaff0fbe3f6a7f8e49672546a02 (diff) | |
| download | gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar.gz gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar.bz2 gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar.lz gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar.xz gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.tar.zst gsoc2013-evolution-75741e52c3431a8fa16ed535329fb76cb2840100.zip | |
Fix compilation errors.
Diffstat (limited to 'mail')
| -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; |