[pan: 14/21] Another forgotten conflict fix...

[Dominique Dumont <ddumont src gnome org>]

commit a91de9d7fa4db3669d3e84f9e169999c28b96977
Author: FoxMcCloud45 <foxmccloud45 hotmail com>
Date:   Wed Jul 7 10:18:48 2021 +0200

    Another forgotten conflict fix...

 pan/gui/prefs-ui.cc | 7 -------
 1 file changed, 7 deletions(-)
---
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 8452f5f..aac9ec1 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -18,15 +18,8 @@
  */
 
 #include <config.h>
-<<<<<<< HEAD
 #include "gtk-compat.h"
 #include <glib/gi18n.h>
-=======
-#include <glib/gi18n.h>
-extern "C" {
-  #include "gtk-compat.h"
-}
->>>>>>> face-support
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/file-util.h>