From 2b0f720850ca80e9f28392112d80a47939582a93 Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Tue, 19 Apr 2016 11:54:00 -0700
Subject: [PATCH] Bad merge

---
 .../lib/middleman-core/template_context.rb           | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/middleman-core/lib/middleman-core/template_context.rb b/middleman-core/lib/middleman-core/template_context.rb
index 08394c24..99ec6ee5 100644
--- a/middleman-core/lib/middleman-core/template_context.rb
+++ b/middleman-core/lib/middleman-core/template_context.rb
@@ -34,18 +34,6 @@ module Middleman
       @app = app
       @locs = locs
       @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
 
     # Return the current buffer to the caller and clear the value internally.