From e317e5e1e198147aa86dc04da5962c7277601967 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 27 Jun 2016 02:52:39 +0900
Subject: Remove conflict line [ci skip]

---
 actioncable/README.md | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actioncable')

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
 
-- 
cgit v1.2.3