diff options
| author | Joakim Verona <joakim@verona.se> | 2013-09-11 07:32:27 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2013-09-11 07:32:27 +0200 |
| commit | ac845636437cfd96001525f7f090ec0dc336731e (patch) | |
| tree | 2acf242c26504e03f1e5ba53d82358e775c36fdd /src/emacsgtkfixed.c | |
| parent | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (diff) | |
| parent | 93ef404dc95f947e1c48000a46968fd252781b9d (diff) | |
| download | emacs-ac845636437cfd96001525f7f090ec0dc336731e.tar.gz | |
fix conflicts
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 1e57eeb57c4..8de2db4dca5 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -23,9 +23,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "lisp.h" #include "frame.h" #include "xterm.h" +<<<<<<< HEAD #ifdef HAVE_XWIDGETS #include "xwidget.h" #endif +======= +>>>>>>> trunk #include "emacsgtkfixed.h" /* Silence a bogus diagnostic; see GNOME bug 683906. */ |