From ce06ed4bb141c7c41bc73375cb3a1d3bfbf587c2 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@hackvalue.de>
Date: Fri, 5 Sep 2014 14:16:20 +0000
Subject: [PATCH] merge conflicts

---
 lib/liquid/parser_switching.rb | 2 +-
 lib/liquid/template.rb         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/liquid/parser_switching.rb b/lib/liquid/parser_switching.rb
index 9dd19db..5fc0f38 100644
--- a/lib/liquid/parser_switching.rb
+++ b/lib/liquid/parser_switching.rb
@@ -25,7 +25,7 @@ module Liquid
     end
 
     def markup_context(markup)
-      "in \"#{markup.strip}\"" 
+      "in \"#{markup.strip}\""
     end
   end
 end
diff --git a/lib/liquid/template.rb b/lib/liquid/template.rb
index 3c0a672..4b5052c 100644
--- a/lib/liquid/template.rb
+++ b/lib/liquid/template.rb
@@ -105,7 +105,6 @@ module Liquid
     def parse(source, options = {})
       @options = options
       @profiling = options[:profile]
-      @profiling = options.delete(:profile)
       @line_numbers = options.delete(:line_numbers)
       @root = Document.parse(tokenize(source), DEFAULT_OPTIONS.merge(options))
       @warnings = nil