[Xfce4-commits] <xfce4-panel:devel> Fix a merge conflict.

[Nick Schermer]

Updating branch refs/heads/devel
         to 8ccab4a88f1901ac536171272d9a6da5bcd4e987 (commit)
       from a3b3400713bb852d7be6256ac5b3023c135d3803 (commit)

commit 8ccab4a88f1901ac536171272d9a6da5bcd4e987
Author: Nick Schermer <nick at xfce.org>
Date:   Sat May 30 21:19:51 2009 +0200

    Fix a merge conflict.

 panel/panel-module.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/panel/panel-module.h b/panel/panel-module.h
index 80f3265..fe9a17b 100644
--- a/panel/panel-module.h
+++ b/panel/panel-module.h
@@ -41,12 +41,8 @@ typedef struct _PanelModule      PanelModule;
 GType        panel_module_get_type                 (void) G_GNUC_CONST;
 
 PanelModule *panel_module_new_from_desktop_file    (const gchar             *filename,
-<<<<<<< HEAD:panel/panel-module.h
                                                     const gchar             *name,
-                                                    gboolean                 force_external);
-=======
-                                                    const gchar             *name) G_GNUC_MALLOC;
->>>>>>> 28526cf4dfc9d6c9a577dff4fff44b21d52479aa:panel/panel-module.h
+                                                    gboolean                 force_external) G_GNUC_MALLOC;
 
 GtkWidget   *panel_module_new_plugin               (PanelModule             *module,
                                                     GdkScreen               *screen,