Correct merge errors

2023-11-12 10:15:29 +00:00
parent 7a6372ed02
commit 59982df827
2 changed files with 0 additions and 9 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2195,11 +2195,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "reminder-rs"
-<<<<<<< HEAD
 version = "1.6.50"
-=======
-version = "1.6.48"
->>>>>>> 97f186d (Add metrics)
 dependencies = [
 "base64 0.21.5",
 "chrono",
@ -2227,11 +2223,7 @@ dependencies = [

 [[package]]
 name = "reminder_web"
-<<<<<<< HEAD
 version = "0.1.4"
-=======
-version = "0.1.3"
->>>>>>> 97f186d (Add metrics)
 dependencies = [
 "base64 0.13.1",
 "chrono",