Skip to content

Commit

Permalink
Fixes #12806 - adding merge_default to attr_accessible in lookup_key
Browse files Browse the repository at this point in the history
  • Loading branch information
orrabin authored and dLobatog committed Dec 15, 2015
1 parent 4852622 commit b4e3c77
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/models/lookup_keys/lookup_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def self.hidden_value
:key, :key_type, :hidden_value,
:lookup_values_attributes, :lookup_values, :lookup_value_ids,
:lookup_values_count,
:merge_overrides,
:merge_overrides, :merge_default,
:override, :override_value_order, :override_values_count, :override_values,
:override_value_ids,
:path,
Expand Down

0 comments on commit b4e3c77

Please sign in to comment.