fix: fix rebase conflicts

invoke-ai · Jul 10, 2023 · b72c832 · b72c832
1 parent 58fe07a
commit b72c832
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 32 deletions.
diff --git a/invokeai/app/services/board_image_record_storage.py b/invokeai/app/services/board_image_record_storage.py
@@ -1,9 +1,8 @@
 import sqlite3
 import threading
+from abc import ABC, abstractmethod
 from typing import Optional, cast
 
-from ABC import abstractmethod
-
 from invokeai.app.services.board_record_storage import BoardRecord
 from invokeai.app.services.image_record_storage import OffsetPaginatedResults
 from invokeai.app.services.models.image_record import (