From e86442cd30b11e13418d6258d2e4c7417a15ec6a Mon Sep 17 00:00:00 2001
From: slorello89 <slorello89@gmail.com>
Date: Sat, 7 Dec 2019 07:31:43 -0500
Subject: [PATCH] Adding full set of signing tests and dlr test

---
 Nexmo.Api.Test.Unit/SmsTest.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Nexmo.Api.Test.Unit/SmsTest.cs b/Nexmo.Api.Test.Unit/SmsTest.cs
index bb7449fa9..09563a458 100644
--- a/Nexmo.Api.Test.Unit/SmsTest.cs
+++ b/Nexmo.Api.Test.Unit/SmsTest.cs
@@ -1,5 +1,7 @@
 using Newtonsoft.Json;
 using Nexmo.Api.Cryptography;
+using System.Web;
+using System;
 using System.Collections.Generic;
 using System.Web;
 using Xunit;
@@ -73,12 +75,17 @@ public void TestGenerateSignatureMD5()
               ""concat-total"": ""3"",
               ""concat-part"": ""2"",
               ""data"": ""abc123"",
+<<<<<<< HEAD
 <<<<<<< HEAD
               ""udh"": ""abc123"",
               ""sig"":""12345""
 =======
               ""udh"": ""abc123""
 >>>>>>> adding signature and inbound test
+=======
+              ""udh"": ""abc123"",
+              ""sig"":""12345""
+>>>>>>> Adding full set of signing tests and dlr test
             }";
             var message = JsonConvert.DeserializeObject<SMS.SMSInbound>(request);
             var dict = JsonConvert.DeserializeObject<Dictionary<string, string>>(request);
@@ -244,7 +251,6 @@ public void TestDLRStruct()
         [Fact]
         public void TestSendSmsWithSig()
         {
-
         }
     }
 }