jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Correct merge errors

Browse Source
This commit is contained in:
jude 2023-11-12 10:15:29 +00:00
parent 7a6372ed02
commit 59982df827
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

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

1
web/src/routes/dashboard/mod.rs
View File

@ -8,7 +8,6 @@ use rocket::{
response::Redirect, response::Redirect,
serde::json::json, serde::json::json,
}; };
use rocket_dyn_templates::Template;
use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
use serenity::{ use serenity::{
client::Context, client::Context,