From 476aca0967730360c31bc9aa5c08cf6aa7c0c9fe Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Wed, 4 Nov 2015 17:23:24 -0600 Subject: Fix a merge fail syntax issue --- lib/action_cable/channel/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb index 67b312e5ea..8bfb74fa89 100644 --- a/lib/action_cable/channel/base.rb +++ b/lib/action_cable/channel/base.rb @@ -76,7 +76,7 @@ module ActionCable SUBSCRIPTION_CONFIRMATION_INTERNAL_MESSAGE = 'confirm_subscription'.freeze SUBSCRIPTION_REJECTION_INTERNAL_MESSAGE = 'reject_subscription'.freeze - attr_reader :params, :connection, ::identifier + attr_reader :params, :connection, :identifier delegate :logger, to: :connection class << self -- cgit v1.2.3