fix broken merge conflict

This commit is contained in:
Zomatree
2023-04-01 23:09:29 +01:00
parent a60ae78176
commit 83429f9f65
2 changed files with 6 additions and 7 deletions

View File

@@ -4,7 +4,7 @@ use schemars::schema::{InstanceType, Schema, SchemaObject, SingleOrVec};
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use crate::models::{Bot, Channel, Emoji, Invite, Member, Message, Server, ServerBan, User, Webhook};
use crate::models::{Bot, Channel, Emoji, Invite, Member, Message, Server, ServerBan, User, Webhook, Report};
use crate::presence::presence_is_online;
use crate::{Database, Error, Result};