Resolved merge conflicts
Showing
- .reuse/dep5 2 additions, 3 deletions.reuse/dep5
- Examples/ConsoleAppExample/ConsoleAppExample.csproj 8 additions, 0 deletionsExamples/ConsoleAppExample/ConsoleAppExample.csproj
- Examples/ConsoleAppExample/SenderDemo.cs 3 additions, 2 deletionsExamples/ConsoleAppExample/SenderDemo.cs
- Examples/ConsoleAppExample/SubscriberDemo.cs 7 additions, 3 deletionsExamples/ConsoleAppExample/SubscriberDemo.cs
- FitConnect/BaseClasses/FunctionalBaseClass.cs 1 addition, 1 deletionFitConnect/BaseClasses/FunctionalBaseClass.cs
- FitConnect/Builder/SubmissionBuilder.cs 16 additions, 21 deletionsFitConnect/Builder/SubmissionBuilder.cs
- FitConnect/EncryptedSender.cs 61 additions, 2 deletionsFitConnect/EncryptedSender.cs
- FitConnect/Encryption/CertificateHelper.cs 3 additions, 3 deletionsFitConnect/Encryption/CertificateHelper.cs
- FitConnect/Encryption/EncryptionSettings.cs 2 additions, 0 deletionsFitConnect/Encryption/EncryptionSettings.cs
- FitConnect/Encryption/FitEncryption.cs 3 additions, 2 deletionsFitConnect/Encryption/FitEncryption.cs
- FitConnect/Encryption/JsonHelper.cs 1 addition, 0 deletionsFitConnect/Encryption/JsonHelper.cs
- FitConnect/FitConnect.csproj 19 additions, 11 deletionsFitConnect/FitConnect.csproj
- FitConnect/FitConnectClient.cs 29 additions, 10 deletionsFitConnect/FitConnectClient.cs
- FitConnect/FitConnectEnvironment.cs 1 addition, 0 deletionsFitConnect/FitConnectEnvironment.cs
- FitConnect/Interfaces/IFitConnectClient.cs 1 addition, 10 deletionsFitConnect/Interfaces/IFitConnectClient.cs
- FitConnect/Interfaces/IRouter.cs 6 additions, 4 deletionsFitConnect/Interfaces/IRouter.cs
- FitConnect/Interfaces/Subscriber/ISubscriber.cs 14 additions, 3 deletionsFitConnect/Interfaces/Subscriber/ISubscriber.cs
- FitConnect/Models/Attachment.cs 1 addition, 1 deletionFitConnect/Models/Attachment.cs
- FitConnect/Models/SET/AuthenticationTags.cs 1 addition, 1 deletionFitConnect/Models/SET/AuthenticationTags.cs
- FitConnect/Models/Submission.cs 2 additions, 2 deletionsFitConnect/Models/Submission.cs
Loading
Please register or sign in to comment