mirror of
https://github.com/middleman/middleman.git
synced 2022-11-09 12:20:27 -05:00
Bad merge
This commit is contained in:
parent
b386dcdc40
commit
2b0f720850
1 changed files with 0 additions and 12 deletions
|
@ -34,18 +34,6 @@ module Middleman
|
||||||
@app = app
|
@app = app
|
||||||
@locs = locs
|
@locs = locs
|
||||||
@opts = opts
|
@opts = opts
|
||||||
|
|
||||||
@locs.each do |k, _|
|
|
||||||
next unless self.respond_to?(k)
|
|
||||||
|
|
||||||
msg = "Template local `#{k}` tried to overwrite an existing context value. Please renamed the key when passing to `locals`"
|
|
||||||
|
|
||||||
if app.build?
|
|
||||||
throw msg
|
|
||||||
else
|
|
||||||
logger.error(msg)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Return the current buffer to the caller and clear the value internally.
|
# Return the current buffer to the caller and clear the value internally.
|
||||||
|
|
Loading…
Reference in a new issue