Fixing merge issues

Author: InbarGazit

launcher-csharp/Admin/Examples/CreateUser.cs

@@ -133,6 +133,7 @@ private static NewUserRequest ConstructNewUserRequest(
                 AutoActivateMemberships = true,
             };
         }
+
         //ds-snippet-end:Admin1Step5
     }
 }

launcher-csharp/eSignature/Controllers/FocusedView.cs

@@ -1,17 +1,15 @@
-// <copyright file="Eg044FocusedViewController.cs" company="DocuSign">
+// <copyright file="FocusedView.cs" company="DocuSign">
 // Copyright (c) DocuSign. All rights reserved.
 // </copyright>
 
 namespace DocuSign.CodeExamples.Views
 {
     using System;
+    using System.Runtime.InteropServices;
     using DocuSign.CodeExamples.Common;
     using DocuSign.CodeExamples.Controllers;
     using DocuSign.CodeExamples.Models;
-    using System.Runtime.InteropServices;
     using Microsoft.AspNetCore.Mvc;
-    using DocuSign.Rooms.Model;
-    using System.Configuration;
     using Microsoft.Extensions.Configuration;
 
     [Area("eSignature")]
@@ -22,16 +20,16 @@ public class FocusedView : EgController
         private readonly string signerClientId = "1000";
         private readonly string dsReturnUrl;
         private readonly string dsIntegrationKey;
-        private readonly IConfiguration _configuration;
+        private readonly IConfiguration configuration;
 
-        public FocusedView(DSConfiguration config, IConfiguration configuration, LauncherTexts launcherTexts, IRequestItemsService requestItemsService)
+        public FocusedView(DsConfiguration config, IConfiguration configuration, LauncherTexts launcherTexts, IRequestItemsService requestItemsService)
             : base(config, launcherTexts, requestItemsService)
         {
             this.dsPingUrl = config.AppUrl + "/";
             this.dsReturnUrl = config.AppUrl + "/dsReturn";
-            _configuration = configuration;
+            this.configuration = configuration;
 
-            this.CodeExampleText = this.GetExampleText("eg044", ExamplesAPIType.ESignature);
+            this.CodeExampleText = this.GetExampleText("eg044", ExamplesApiType.ESignature);
             this.ViewBag.title = this.CodeExampleText.ExampleName;
         }
 
@@ -53,11 +51,11 @@ public IActionResult Create(string signerEmail, string signerName)
             string docPDF;
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                docPDF = Convert.ToBoolean(this.Config.QuickACG) ? @"../launcher-csharp/" + this.Config.DocPdf : this.Config.DocPdf;
+                docPDF = Convert.ToBoolean(this.Config.QuickAcg) ? @"../launcher-csharp/" + this.Config.DocPdf : this.Config.DocPdf;
             }
             else
             {
-                docPDF = Convert.ToBoolean(this.Config.QuickACG) ? @"..\\launcher-csharp\\" + this.Config.DocPdf : this.Config.DocPdf;
+                docPDF = Convert.ToBoolean(this.Config.QuickAcg) ? @"..\\launcher-csharp\\" + this.Config.DocPdf : this.Config.DocPdf;
             }
 
             // Check the token with minimal buffer time.
@@ -88,7 +86,7 @@ public IActionResult Create(string signerEmail, string signerName)
             // Save for future use within the example launcher
             this.RequestItemsService.EnvelopeId = result.Item1;
             this.ViewBag.Url = result.Item2;
-            this.ViewBag.IntegrationKey = this._configuration["DocuSign:ClientId"];
+            this.ViewBag.IntegrationKey = this.configuration["DocuSign:ClientId"];
 
             // Redirect the user to the Signing Ceremony
             return this.View("embed");

launcher-csharp/eSignature/Examples/FocusedView.cs

@@ -123,6 +123,7 @@ public static RecipientViewRequest MakeRecipientViewRequest(string signerEmail,
 
             return viewRequest;
         }
+
         //ds-snippet-end:eSign44Step4
 
         //ds-snippet-start:eSign44Step2
@@ -193,6 +194,7 @@ public static EnvelopeDefinition MakeEnvelope(string signerEmail, string signerN
 
             return envelopeDefinition;
         }
+
         //ds-snippet-end:eSign44Step2
     }
 }