X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngineLoader.pm;fp=lib%2FCatalyst%2FEngineLoader.pm;h=b775101454ed1198fda955976f2942fc44520710;hb=d093654748ff1f4e38f310399442e191d9d29e26;hp=818b9f0228de0cd67a59418b30a39b0f91898594;hpb=86c4012a832d62f49efd30e6637289332e749c1e;p=catagits%2FCatalyst-Runtime.git

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