From 943398bcb2d9c377669e44ca6ddc2ad4ed9d274d Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Sun, 27 Oct 2019 16:08:18 +0100
Subject: [PATCH] Fix merge issues

---
 src/core/Elsa.Abstractions/Elsa.Abstractions.csproj     | 4 ----
 src/core/Elsa.Abstractions/Services/IActivityBuilder.cs | 1 +
 src/samples/Sample17/CreatePersonWorkflow.cs            | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj
index 158045e83..b0e4937b7 100644
--- a/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj
+++ b/src/core/Elsa.Abstractions/Elsa.Abstractions.csproj
@@ -24,8 +24,4 @@
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Scripting" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/core/Elsa.Abstractions/Services/IActivityBuilder.cs b/src/core/Elsa.Abstractions/Services/IActivityBuilder.cs
index c6c4463b5..fa5b3928e 100644
--- a/src/core/Elsa.Abstractions/Services/IActivityBuilder.cs
+++ b/src/core/Elsa.Abstractions/Services/IActivityBuilder.cs
@@ -13,6 +13,7 @@ namespace Elsa.Services
         IActivityBuilder Add<T>(Action<T> setup = default, string name = null) where T : class, IActivity;
         IOutcomeBuilder When(string outcome);
         IActivityBuilder Then<T>(Action<T> setup = null, Action<IActivityBuilder> branch = null, string name = null) where T : class, IActivity;
+        IActivityBuilder WithName(string name);
         IActivityBuilder WithDisplayName(string displayName);
         IActivityBuilder WithDescription(string description);
         IWorkflowBuilder Then(string activityName);
diff --git a/src/samples/Sample17/CreatePersonWorkflow.cs b/src/samples/Sample17/CreatePersonWorkflow.cs
index 8a4b903b8..187c79128 100644
--- a/src/samples/Sample17/CreatePersonWorkflow.cs
+++ b/src/samples/Sample17/CreatePersonWorkflow.cs
@@ -1,6 +1,5 @@
 using Elsa.Activities;
 using Elsa.Activities.Console.Activities;
-using Elsa.Activities.Primitives;
 using Elsa.Expressions;
 using Elsa.Scripting.JavaScript;
 using Elsa.Services;