aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actioncable/README.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/actioncable/README.md b/actioncable/README.md
index b3bfd83120..0c8467916c 100644
--- a/actioncable/README.md
+++ b/actioncable/README.md
@@ -442,7 +442,6 @@ The Ruby side of things is built on top of [websocket-driver](https://github.com
## Deployment
->>>>>>> b94b04b1d11b1d095918b8bae2b6b5f76f092cf7
$ gem install actioncable