rebasing

meedan · Aug 27, 2024 · 2b87999 · 2b87999
1 parent 8001c35
commit 2b87999
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/app/lib/smooch_nlu.rb b/app/lib/smooch_nlu.rb
@@ -87,7 +87,11 @@ def self.alegre_matches_from_message(message, language, context, alegre_result_k
           language: language,
         }.merge(context)
       }
+<<<<<<< HEAD
       response = Bot::Alegre.get_sync_with_params(params, "text")
+=======
+      response = Bot::Alegre.get_sync_raw_params(params, "text")
+>>>>>>> 7c7cdd38d (rebase)
 
       # One approach would be to take the option that has the most matches
       # Unfortunately this approach is influenced by the number of keywords per option