aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-06-27 02:52:39 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-06-27 02:52:39 +0900
commite317e5e1e198147aa86dc04da5962c7277601967 (patch)
treeee4442ebfe74f4b9e7d39f0cc0c0d00050475a09
parent5343626ea8b17a92b6b4603f2404ba06800b21b1 (diff)
downloadrails-e317e5e1e198147aa86dc04da5962c7277601967.tar.gz
rails-e317e5e1e198147aa86dc04da5962c7277601967.tar.bz2
rails-e317e5e1e198147aa86dc04da5962c7277601967.zip
Remove conflict line [ci skip]
-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