chore: Resolved Conflicts and merged changes

master
Viraj Trivedi 6 years ago
commit e3d102ecb3

@ -13,12 +13,6 @@ Abstraction for Utilizing [Rocket.Chat](https://rocket.chat/)'s [Realtime API](h
npm install --save rocket.chat.realtime.api.rxjs
```
For RxJS v5 Version of the Package
```
npm install --save rocket.chat.realtime.api.rxjs@1.0.0
```
## Usage
```

Loading…
Cancel
Save