lib/vedeu/models/line.rb in vedeu-0.2.11 vs lib/vedeu/models/line.rb in vedeu-0.2.12
- old
+ new
@@ -25,10 +25,10 @@
#
# @param attributes [Hash]
# @param block [Proc]
# @return [Line]
def initialize(attributes = {}, &block)
- @attributes = defaults.merge!(attributes)
+ @attributes = defaults.merge(attributes)
@parent = @attributes[:parent]
if block_given?
@self_before_instance_eval = eval('self', block.binding)