From: Tomas Doran <bobtfish@bobtfish.net>
Date: Sun, 27 Mar 2011 15:28:25 +0000 (+0100)
Subject: Do not commit conflicts, idiot
X-Git-Tag: 5.89003~55
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d093654748ff1f4e38f310399442e191d9d29e26

Do not commit conflicts, idiot
---

diff --git a/lib/Catalyst/EngineLoader.pm b/lib/Catalyst/EngineLoader.pm
index 818b9f0..b775101 100644
--- a/lib/Catalyst/EngineLoader.pm
+++ b/lib/Catalyst/EngineLoader.pm
@@ -83,7 +83,6 @@ around guess => sub {
     if (!defined $old_engine) { # Not overridden
     }
     elsif ($old_engine =~ /^(PSGI|CGI|FastCGI|HTTP|Apache.*)$/) {
->>>>>>> Fix bug stopping fastcgi script working
         # Trust autodetect
     }
     elsif ($old_engine eq "HTTP::Prefork") { # Too bad if you're customising, we don't handle options