Permalink
Browse files

added search functionality

  • Loading branch information...
2 parents f6f35ab + 731dea8 commit 3d8cbdc3ae0d458922a17a43b7c4b9816fc2ddcb @WilliamFraser WilliamFraser committed Mar 21, 2012
Showing with 12 additions and 0 deletions.
  1. +12 −0 geanymacro/src/geanymacro.c
@@ -841,7 +841,11 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
void plugin_help(void)
{
GtkWidget *dialog,*label,*scroll;
+<<<<<<< HEAD
gchar * cText;
+=======
+ gchar *cText;
+>>>>>>> 731dea83b9e257e73b952823af7a87791ecddd43
/* create dialog box */
dialog=gtk_dialog_new_with_buttons(_("Geany Macros help"),
@@ -850,7 +854,11 @@ void plugin_help(void)
GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
NULL);
+<<<<<<< HEAD
/* setup help text */
+=======
+/* setup help text */
+>>>>>>> 731dea83b9e257e73b952823af7a87791ecddd43
cText=g_strconcat(
_("This Plugin implements Macros in Geany.\n\n"),
_("This plugin allows you to record and use your own macros. "),
@@ -913,6 +921,10 @@ NULL);
/* free memory */
g_free(cText);
+<<<<<<< HEAD
+=======
+
+>>>>>>> 731dea83b9e257e73b952823af7a87791ecddd43
}

0 comments on commit 3d8cbdc

Please sign in to comment.