Do not commit conflicts, idiot

diff --git a/lib/Catalyst/EngineLoader.pm b/lib/Catalyst/EngineLoader.pm
index 818b9f0..b775101 100644 (file)
--- 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