resolve conflict

This commit is contained in:
Quan HL
2023-05-29 21:00:05 +07:00
2 changed files with 4 additions and 3268 deletions
+3 -3267
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "sbc-sip-sidecar",
"version": "0.8.1",
"version": "0.8.3",
"description": "SBC SIP sidecar app (handles REGISTER and OPTIONS)",
"main": "app.js",
"engines": {