diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
| commit | 2bb79f893805e972f6efe5cb7cfe90dd0efa4107 (patch) | |
| tree | 47084acc8d48126b9e891bb50c217be43be27641 /vendor/plugins/gettext_i18n_rails | |
| parent | 22c25e42847d41924d43d31f3ef67be1ae4a155e (diff) | |
| parent | 1fb57d66c22000d4164c033ffd9353aa9030255b (diff) | |
resolve merge conflicts
Diffstat (limited to 'vendor/plugins/gettext_i18n_rails')
| -rw-r--r-- | vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb index 3a8ee6f65..22e1b9a77 100644 --- a/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb +++ b/vendor/plugins/gettext_i18n_rails/lib/gettext_i18n_rails/i18n_hacks.rb @@ -35,4 +35,6 @@ module I18n self.locale = current_locale if tmp_locale end end -end
\ No newline at end of file + +end + |