1 files changed, 56 insertions, 0 deletions
diff --git a/src/voikko/voikko_provider.c b/src/voikko/voikko_provider.c
index 8424e2c..53c6ae2 100644
--- a/src/voikko/voikko_provider.c
+++ b/src/voikko/voikko_provider.c
@@ -80,6 +80,7 @@ voikko_dict_suggest (EnchantDict * me, const char *const word,
 
 <<<<<<< .mine
 <<<<<<< .mine
+<<<<<<< .mine
 static char **
 voikko_dict_hyphenate (EnchantDict * me, const char *const word,
 					 size_t len, size_t * out_n_suggs)
@@ -131,6 +132,61 @@ voikko_dict_hyphenate (EnchantDict * me, const char *const word)
 
 
 >>>>>>> .theirs
+=======
+static char *
+voikko_dict_hyphenate (EnchantDict * me, const char *const word)
+{
+	char*result=0;
+	int voikko_handle;
+    voikko_handle = (long) me->user_data;
+
+	result=voikko_hyphenate_cstr(voikko_handle,word);
+	return result;	
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
 static EnchantDict *
 voikko_provider_request_dict (EnchantProvider * me, const char *const tag)
 {