diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2015-11-04 17:23:24 -0600 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2015-11-04 17:23:24 -0600 |
| commit | 476aca0967730360c31bc9aa5c08cf6aa7c0c9fe (patch) | |
| tree | c60a4c598e382a051bc37a3d139419156b259b34 /lib/action_cable | |
| parent | cb4ef80f20a23e9c42876b039d8af7d02fd416fb (diff) | |
| download | rails-476aca0967730360c31bc9aa5c08cf6aa7c0c9fe.tar.gz rails-476aca0967730360c31bc9aa5c08cf6aa7c0c9fe.tar.bz2 rails-476aca0967730360c31bc9aa5c08cf6aa7c0c9fe.zip | |
Fix a merge fail syntax issue
Diffstat (limited to 'lib/action_cable')
| -rw-r--r-- | lib/action_cable/channel/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |