Permalink
Browse files

fixed bad merge

  • Loading branch information...
majastanislawska committed Dec 15, 2011
1 parent 104efe6 commit a802d9f140ddab883e4125e24b5868eb6631acae
Showing with 1 addition and 5 deletions.
  1. +1 −5 src/boss/boss_web_controller.erl
@@ -409,11 +409,7 @@ process_result(_, {ok, Payload, Headers}) ->
{200, [{"Content-Type", proplists:get_value("Content-Type", Headers, "text/html")}
|proplists:delete("Content-Type", Headers)], Payload}.
-<<<<<<< HEAD
-load_and_execute(production, {Controller, _, _} = Location, AppInfo, Instance, Req, SessionID) ->
-=======
-load_and_execute(Mode, {Controller, _, _} = Location, AppInfo, Req, SessionID) when Mode =:= production; Mode =:= testing->
->>>>>>> 35647bade37ccab697e23b2256d0259c940e4b51
+load_and_execute(Mode, {Controller, _, _} = Location, AppInfo, Instance, Req, SessionID) when Mode =:= production; Mode =:= testing->
case lists:member(boss_files:web_controller(AppInfo#boss_app_info.application, Controller),
AppInfo#boss_app_info.controller_modules) of
true -> execute_action(Location, AppInfo, Instance, Req, SessionID);

0 comments on commit a802d9f

Please sign in to comment.