Fix 0.1.3 merge conflict

[mjjimenez]

Description

Fix conflict for 0.1.3 release

Checklist

• [x] I have followed the Contribution Guidelines and Code of Conduct
• [x] I have commented my code following the OpenMined Styleguide
• [x] I have labeled this PR with the relevant Type labels

[codecov[bot]]

Codecov Report

Merging #166 into dev will increase coverage by 1.48%. The diff coverage is 78.57%.

@@            Coverage Diff             @@
##              dev     #166      +/-   ##
==========================================
+ Coverage   52.97%   54.46%   +1.48%     
==========================================
  Files          16       16              
  Lines        1882     1882              
==========================================
+ Hits          997     1025      +28     
+ Misses        885      857      -28     

Impacted Files	Coverage Δ
SwiftSyft/Classes/SignallingMessages.swift	35.03% <50.00%> (ø)
SwiftSyft/Classes/NetworkManager.swift	73.07% <100.00%> (ø)
SwiftSyft/Classes/SyftClient.swift	80.46% <100.00%> (+1.74%)	:arrow_up:
SwiftSyft/Classes/SignallingClient.swift	87.27% <0.00%> (+16.36%)	:arrow_up:
SwiftSyft/Classes/SyftWebSocket.swift	22.03% <0.00%> (+22.03%)	:arrow_up:

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update c4af744...8007370. Read the comment docs.