Fix git conflict.

Author: sipsorcery

.github/workflows/datachannel_echo-test.yml

@@ -111,6 +111,6 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          git pull
           git commit DataChannel_Echo_test_results.md README.md -m "Automated data channel echo test results."
+          git pull --rebase
           git push

.github/workflows/peerconnection-test.yml

@@ -163,6 +163,6 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          git pull
           git commit PeerConnection_test_results.md README.md -m "Automated peer connection test results."
+          git pull --rebase
           git push   

sipsorcery/client/README.md

@@ -1,10 +1,10 @@
 **Description**
 
-A .NET Core console application that acts as a peer for a WebRTC Echo Server.
+A .NET console application that acts as a peer for a WebRTC Echo Server.
 
 **Prerequisites**
 
-The .NET 5 SDK needs to be installed as per https://dotnet.microsoft.com/download/dotnet/5.0.
+The .NET 5 SDK needs to be installed as per https://dotnet.microsoft.com/download/dotnet/8.0.
 
 Note the full SDK install is required, and not the runtime-only option, so as the console application can be built from source.
 

sipsorcery/server/README.md

@@ -1,10 +1,10 @@
 **Description**
 
-A .NET Core console application that runs a WebRTC Echo Server.
+A .NET console application that runs a WebRTC Echo Server.
 
 **Prerequisites**
 
-The .NET 5 SDK needs to be installed as per https://dotnet.microsoft.com/download/dotnet/5.0.
+The .NET 8 SDK needs to be installed as per https://dotnet.microsoft.com/download/dotnet/8.0.
 
 Note the full SDK install is required, and not the runtime-only option, so as the console application can be built from source.