Skip to content

Commit

Permalink
Merge conflict fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
namesty committed Jan 25, 2024
1 parent 70eaaeb commit 3b190b5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions workers/fund_public_goods/db/tables/projects.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any, Dict
from fund_public_goods.agents.researcher.models.answer import Answer
from fund_public_goods.agents.researcher.models.project import Project
from fund_public_goods.lib.strategy.models.answer import Answer
from fund_public_goods.lib.strategy.models.project import Project
from supabase import Client, PostgrestAPIResponse
import uuid

Expand Down
2 changes: 1 addition & 1 deletion workers/fund_public_goods/lib/strategy/utils/utils.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from fund_public_goods.agents.researcher.models.project import Project
from fund_public_goods.lib.strategy.models.project import Project


def stringify_projects(projects: list[Project], separator: str) -> str:
Expand Down

0 comments on commit 3b190b5

Please sign in to comment.