From 6c598952c71e849f41d05cf73aca5c55eec1172f Mon Sep 17 00:00:00 2001
From: Bolo <36342729+PppBr@users.noreply.github.com>
Date: Mon, 6 Aug 2018 13:45:14 -0500
Subject: [PATCH] fixed the string join bug for sebis

---
 BotSharp.Core/Engines/Sebis/AgentImporterInSebis.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BotSharp.Core/Engines/Sebis/AgentImporterInSebis.cs b/BotSharp.Core/Engines/Sebis/AgentImporterInSebis.cs
index 38b80a84..48863211 100644
--- a/BotSharp.Core/Engines/Sebis/AgentImporterInSebis.cs
+++ b/BotSharp.Core/Engines/Sebis/AgentImporterInSebis.cs
@@ -117,12 +117,9 @@ namespace BotSharp.Core.Engines
                     }
                 }
 
-<<<<<<< HEAD
-=======
                 int second = 0;
                 expression.Data.ForEach(x => x.UpdatedTime = DateTime.UtcNow.AddSeconds(second++));
 
->>>>>>> b389d837f25afa256b35d0418274967557fb06f9
                 intent.UserSays.Add(expression);
             });
         }