From b272fec78e30d1a10f3ab761684a119193391296 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 19 十一月 2024 17:08:57 +0800
Subject: [PATCH] 解决冲突

---
 app/api/__init__.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app/api/__init__.py b/app/api/__init__.py
index 2f325c1..33175b2 100644
--- a/app/api/__init__.py
+++ b/app/api/__init__.py
@@ -2,7 +2,7 @@
 from urllib.parse import urlencode
 
 import jwt
-from cryptography.fernet import Fernet
+# from cryptography.fernet import Fernet
 from fastapi import FastAPI, Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer
 from passlib.context import CryptContext

--
Gitblit v1.8.0