diff --git a/ChangeLog b/ChangeLog index f920ca2ff3..024669496f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Sep 25 22:48:06 2016 namusyaka + + * lib/erb.rb (ERB::Compiler::TrimScanner#stag): The :stag accessor + has already been available because it is defined in parent + Scanner class. [Fix GH-1445] + Sun Sep 25 19:21:26 2016 Kazuki Tsujimoto * node.c (dump_array): remove duplicate header of NODE_ARRAY/ diff --git a/lib/erb.rb b/lib/erb.rb index af5a4bac9c..7f9ec11b85 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -399,7 +399,6 @@ class ERB @scan_line = self.method(:scan_line) end end - attr_accessor :stag def scan(&block) @stag = nil