Fix merge conflicts.

Cargo.toml

@@ -14,7 +14,6 @@ authors = [
 edition = "2021"
 
 [dependencies]
-<<<<<<< HEAD
 
 serde_json    = "1.0.125"
 lazy_static   = "1.5.0"
@@ -28,27 +27,10 @@ thiserror     = "1.0.63"
 rand          = "0.8.5"
 xkbcommon     = "0.8.0"
 libc          = "0.2.158"
-=======
-serde_json = "1.0.104"
-lazy_static = "1.4.0"
-json_comments = "0.2.1"
-regex = "1.9.6"
-slog-term = "2.9.0"
-bitflags = "2.4.1"
-colored = "2.0.4"
-xcursor = "0.3.4"
-thiserror = "1.0.50"
-rand = "0.8.5"
-xkbcommon = "0.6.0"
-libc = "0.2.147"
 tokio = { version = "1.33.0", features = ["full", "tracing"] }
 chrono = "0.4.31"
 anyhow = "1.0.75"
-<<<<<<< HEAD
->>>>>>> c3c040b (Add deps `tokio`, `chrono`, `anyhow`)
-=======
 color-eyre = { version = "0.6.3" }
->>>>>>> 30c8151 (Add `color_eyre` for panic handling.)
 
 [dependencies.json-tree]
 
@@ -63,11 +45,7 @@ features = ["desktop", "default", "backend_egl", "use_system_lib"]
 
 [dependencies.serde]
 
-<<<<<<< HEAD
 version  = "1.0.208"
-=======
-version = "1.0.190"
->>>>>>> 30c8151 (Add `color_eyre` for panic handling.)
 features = ["derive"]
 
 [dependencies.slog]