fix: resolve package.json conflict with release branch#378

andreabadesso merged 3 commits into

release-candidateHathorNetwork/hathor-wallet-service:release-candidatefrom

fix/resolve-release-conflict-v1.12.0HathorNetwork/hathor-wallet-service:fix/resolve-release-conflict-v1.12.0Copy head branch name to clipboard