diff options
| author | vlad <vlad@driver.xyz> | 2017-03-20 18:55:58 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-03-20 18:55:58 -0700 |
| commit | dcceb9aae8073617f43335c83647af5ccf8685ef (patch) | |
| tree | e055c0556a58614588473b862b9f315f945e8163 /src/main/scala/xyz/driver/core/time.scala | |
| parent | 7f03501bf652214a4a8d12f62764f73257714d7e (diff) | |
| parent | 5b96449bfcb9117c755e1b48a8462f79d6e1230c (diff) | |
| download | driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.tar.gz driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.tar.bz2 driver-core-dcceb9aae8073617f43335c83647af5ccf8685ef.zip | |
Merge remote-tracking branch 'origin/master' into master3v0.10.31
Diffstat (limited to 'src/main/scala/xyz/driver/core/time.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/time.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/time.scala b/src/main/scala/xyz/driver/core/time.scala index cbb86ed..ed5eb11 100644 --- a/src/main/scala/xyz/driver/core/time.scala +++ b/src/main/scala/xyz/driver/core/time.scala @@ -30,7 +30,7 @@ object time { def toDate(timezone: TimeZone): date.Date = { val cal = Calendar.getInstance(timezone) cal.setTimeInMillis(millis) - date.Date(cal.get(Calendar.YEAR), date.tagMonth(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH)) + date.Date(cal.get(Calendar.YEAR), date.Month(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH)) } } |