Fix merge error :(

d5a2ff5f · Jacob Vosmaer · cf8f25bc · d5a2ff5f
Commit d5a2ff5f authored Jan 08, 2016 by Jacob Vosmaer
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

main.go main.go +1 -1

No files found.
--- a/main.go
+++ b/main.go
@@ -105,7 +105,7 @@ var httpRoutes = [...]httpRoute{
 	// from downloading it we make sure requests to /uploads/ do _not_ pass
 	// through handleServeFile.
 	httpRoute{"", regexp.MustCompile(`^/uploads/`),
-		handleRailsError(documentRoot,
+		handleRailsError(documentRoot, developmentMode,
 			proxyRequest,
 		),
 	},