From 15fc5f93a6ca91857c0f07794a37ff0192db0122 Mon Sep 17 00:00:00 2001 From: zevaryx Date: Thu, 23 Mar 2023 22:06:12 -0600 Subject: [PATCH] Fix merge breaks --- jarvis_core/config.py | 3 ++- jarvis_core/db/models/modlog.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jarvis_core/config.py b/jarvis_core/config.py index 15af84f..6802784 100644 --- a/jarvis_core/config.py +++ b/jarvis_core/config.py @@ -1,5 +1,6 @@ """Load global config.""" -import os +import ast +from os import environ from lib2to3.pgen2 import token from pathlib import Path from typing import Any, Dict, List, Optional, Type diff --git a/jarvis_core/db/models/modlog.py b/jarvis_core/db/models/modlog.py index 77cb6f2..6b53df3 100644 --- a/jarvis_core/db/models/modlog.py +++ b/jarvis_core/db/models/modlog.py @@ -2,6 +2,7 @@ from datetime import datetime, timezone from functools import partial +import nanoid from bson import ObjectId from beanie import Document from pydantic import BaseModel, Field