resolving merge conflicts

Vonage · Feb 5, 2020 · fb1f64a · fb1f64a
2 parents e86442c + 28db3ec
commit fb1f64a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Nexmo.Api.Test.Unit/NumberTest.cs b/Nexmo.Api.Test.Unit/NumberTest.cs
@@ -12,6 +12,7 @@ public void SearchNumbers()
         {
             //ARRANGE
             var expectedUri = $"{RestUrl}/number/search/?country=US&api_key={ApiKey}&api_secret={ApiSecret}&";            
+
             var expectedResponseContent = "{\"count\":177,\"numbers\":[{\"country\":\"US\",\"msisdn\":\"15102694548\",\"type\":\"mobile-lvn\",\"features\":[\"SMS\",\"VOICE\"],\"cost\":\"0.67\"},{\"country\":\"US\",\"msisdn\":\"17088568490\",\"type\":\"mobile-lvn\",\"features\":[\"SMS\",\"VOICE\"],\"cost\":\"0.67\"},{\"country\":\"US\",\"msisdn\":\"17088568491\",\"type\":\"mobile-lvn\",\"features\":[\"SMS\",\"VOICE\"],\"cost\":\"0.67\"},{\"country\":\"US\",\"msisdn\":\"17088568492\",\"type\":\"mobile-lvn\",\"features\":[\"SMS\",\"VOICE\"],\"cost\":\"0.67\"},{\"country\":\"US\",\"msisdn\":\"17088568973\",\"type\":\"mobile-lvn\",\"features\":[\"SMS\",\"VOICE\"],\"cost\":\"0.67\"}]}";
             Setup(uri: expectedUri, responseContent: expectedResponseContent);
 

diff --git a/Nexmo.Api.Test.Unit/SmsTest.cs b/Nexmo.Api.Test.Unit/SmsTest.cs
@@ -5,8 +5,6 @@
 using System.Collections.Generic;
 using System.Web;
 using Xunit;
-
-
 namespace Nexmo.Api.UnitTest
 {
     public class SMS_test : TestBase
@@ -76,6 +74,7 @@ public void TestGenerateSignatureMD5()
               ""concat-part"": ""2"",
               ""data"": ""abc123"",
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
               ""udh"": ""abc123"",
               ""sig"":""12345""
@@ -86,6 +85,10 @@ public void TestGenerateSignatureMD5()
               ""udh"": ""abc123"",
               ""sig"":""12345""
 >>>>>>> Adding full set of signing tests and dlr test
+=======
+              ""udh"": ""abc123"",
+              ""sig"":""12345""
+>>>>>>> 28db3ecf5166c45a149538c39ee678064e115ae1
             }";
             var message = JsonConvert.DeserializeObject<SMS.SMSInbound>(request);
             var dict = JsonConvert.DeserializeObject<Dictionary<string, string>>(request);