diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-06-26 16:02:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 16:02:54 -0300 |
| commit | 77cfe1d0f05da63f629f55229de6357b8489b778 (patch) | |
| tree | ee4442ebfe74f4b9e7d39f0cc0c0d00050475a09 /actioncable | |
| parent | 5343626ea8b17a92b6b4603f2404ba06800b21b1 (diff) | |
| parent | e317e5e1e198147aa86dc04da5962c7277601967 (diff) | |
| download | rails-77cfe1d0f05da63f629f55229de6357b8489b778.tar.gz rails-77cfe1d0f05da63f629f55229de6357b8489b778.tar.bz2 rails-77cfe1d0f05da63f629f55229de6357b8489b778.zip | |
Merge pull request #25534 from kamipo/remove_conflict_line
Remove conflict line [ci skip]
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/README.md | 1 |
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 |