heptat · August 18, 2011 13:21
diff --git a/gistfile1.txt b/gistfile1.txt
 [root@localhost] local/www/oars # git merge x-correct-http-methods2                                                                                   2011-08-18 23:20:26 root pts/4
 Auto-merging tests/capybara/step_definitions/capybara_steps.rb
 Merge made by recursive.
 controllers/ConnectionController.php               |    7 ++-
 controllers/ItemsController.php                    |    1 +
 .../client_admin/candidate_retrieve.feature        |    2 +-
 tests/capybara/step_definitions/capybara_steps.rb  |   41 +++++++++++++--
 .../step_definitions/client_admin_steps.rb         |   54 +++++++++++--------
 tests/capybara/support/env.rb                      |    9 ++-
 views/candidates/index.html.php                    |    2 +-
 7 files changed, 82 insertions(+), 34 deletions(-)
	[root@localhost] local/www/oars # git merge x-correct-http-methods2 2011-08-18 23:20:26 root pts/4
	Auto-merging tests/capybara/step_definitions/capybara_steps.rb
	Merge made by recursive.
	controllers/ConnectionController.php \| 7 ++-
	controllers/ItemsController.php \| 1 +
	.../client_admin/candidate_retrieve.feature \| 2 +-
	tests/capybara/step_definitions/capybara_steps.rb \| 41 +++++++++++++--
	.../step_definitions/client_admin_steps.rb \| 54 +++++++++++--------
	tests/capybara/support/env.rb \| 9 ++-
	views/candidates/index.html.php \| 2 +-
	7 files changed, 82 insertions(+), 34 deletions(-)