dellcloudedge/barclamp-crowbar — pull request #179 by cloudedge (2012-08-31 17:08:14+00:00)
Title: Fix corrupted localization file (added tests to catch) [1/5]

In the last pull, I accidently left a merge conflict in the i18n file.
This corrects that and adds test to catch.

crowbar_framework/app/models/doc.rb | 4 --
crowbar_framework/app/models/nav.rb | 2 +-
crowbar_framework/config/locales/crowbar/en.yml | 5 +--
.../doc/default/crowbar/devguide/testing/units.md | 2 +
crowbar_framework/test/unit/i18n_test.rb | 33 ++++++++++++++++++++
5 files changed, 37 insertions(+), 9 deletions(-)