diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-06 13:42:17 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2012-10-06 13:42:17 -0400 |
| commit | 033696b0b6723dd24615ae109a3eb6f6154c8847 (patch) | |
| tree | cbcd2be37041bc178a956502f7d6f4aaf182d0dd /localization/jquery-ui-timepicker-pt-BR.js | |
| parent | 23a7a882b7c3158b88a7f9e48313088f6e051fa5 (diff) | |
| parent | d57204c8a39a94d7b2e4c8a218d8c5325ac3ffea (diff) | |
| download | jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.zip jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.tar.gz jQuery-Timepicker-Addon-033696b0b6723dd24615ae109a3eb6f6154c8847.tar.bz2 | |
Fix merge conflict
Diffstat (limited to 'localization/jquery-ui-timepicker-pt-BR.js')
| -rw-r--r-- | localization/jquery-ui-timepicker-pt-BR.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/localization/jquery-ui-timepicker-pt-BR.js b/localization/jquery-ui-timepicker-pt-BR.js index efbae6d..ea86993 100644 --- a/localization/jquery-ui-timepicker-pt-BR.js +++ b/localization/jquery-ui-timepicker-pt-BR.js @@ -14,7 +14,8 @@ timeFormat: 'hh:mm', amNames: ['a.m.', 'AM', 'A'], pmNames: ['p.m.', 'PM', 'P'], - ampm: false + ampm: false, + isRTL: false }; $.timepicker.setDefaults($.timepicker.regional['pt-BR']); })(jQuery); |