rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-11 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict mistake

Browse Source
This commit is contained in:
Bojan Serafimov
2022-04-27 13:08:56 -04:00
parent be86621152
commit a06af3c813
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -1656,7 +1656,6 @@ dependencies = [
"hyper",
"itertools",
"lazy_static",
"log",
"metrics",
"nix",
"once_cell",

1
pageserver/Cargo.toml
View File

@@ -18,7 +18,6 @@ hex = "0.4.3"
hyper = "0.14"
itertools = "0.10.3"
lazy_static = "1.4.0"
log = "0.4.14"
clap = { version = "3.1.8", features = ["derive"] }
daemonize = "0.4.1"
tokio = { version = "1.17", features = ["process", "sync", "macros", "fs", "rt", "io-util", "time"] }