From: André Walker <andre@andrewalker.net>
Date: Fri, 29 Jun 2012 21:01:18 +0000 (-0300)
Subject: fixing merge conflicts from master
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6ac0784b4442b46abae68c76318c2189221e725d

fixing merge conflicts from master
---

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 29060e8..4b25a89 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -125,9 +125,6 @@ sub finalize_error {
     sub Catalyst::Log::error { }
 }
 
-<<<<<<< HEAD
-# Make sure we can load Inline plugins.
-=======
 # Pretend to be Plugin::Session and hook finalize_headers to send a header
 
 sub finalize_headers {
@@ -138,8 +135,7 @@ sub finalize_headers {
     return $c->maybe::next::method(@_);
 }
 
-# Make sure we can load Inline plugins. 
->>>>>>> origin/master
+# Make sure we can load Inline plugins.
 
 package Catalyst::Plugin::Test::Inline;