1 files changed, 36 insertions, 0 deletions
diff --git a/src/enchant.h b/src/enchant.h
index 27932a6..f719f6a 100644
--- a/src/enchant.h
+++ b/src/enchant.h
@@ -114,6 +114,7 @@ ENCHANT_MODULE_EXPORT (char **)
 			   ssize_t len, size_t * out_n_suggs);
 <<<<<<< .mine
 <<<<<<< .mine
+<<<<<<< .mine
 
 ENCHANT_MODULE_EXPORT (char **)
 enchant_dict_hyphenate (EnchantDict * dict, const char *const word,
@@ -145,6 +146,41 @@ enchant_dict_hyphenate (EnchantDict * dict, const char *const word);
 
 
 >>>>>>> .theirs
+=======
+
+ENCHANT_MODULE_EXPORT (char *)
+enchant_dict_hyphenate (EnchantDict * dict, const char *const word);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
 ENCHANT_MODULE_EXPORT (void)
      enchant_dict_add (EnchantDict * dict, const char *const word,
 			      ssize_t len);