3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 22 Sep 2014 14:01:30 +0000 (10:01 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 22 Sep 2014 14:01:30 +0000 (10:01 -0400)
commitba46f409f9c572263cb7907eb2f36139a2c0320b
treef209aa2b3934a055d53ac15886eef3d9d14cfb89
parentbbb726b1c675cff7ef34704ecfa05353f971e951
3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/application/_content.html.erb