Skip to content

Commit bd26bd4

Browse files
l-7-ll-7-l
committed
resolve conflicts
1 parent 437ec56 commit bd26bd4

10 files changed

Lines changed: 11 additions & 433 deletions

File tree

‎Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ zstd = "0.13.0"
4444
derive = [ "dep:bitcode_derive" ]
4545
std = [ "serde?/std", "glam?/std", "arrayvec?/std" ]
4646
default = [ "derive", "std" ]
47-
chrono_datetime_fixedoffset = ["dep:chrono"]
4847

4948
[package.metadata.docs.rs]
5049
features = [ "derive", "serde", "std" ]

‎src/ext/date.rs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/ext/date/chrono.rs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/ext/date/chrono/date_time_fixed_offset.rs‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎src/ext/date/chrono/date_time_utc.rs‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/ext/date/chrono/naive_date.rs‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/ext/date/chrono/naive_date_time.rs‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)