Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'develop' into 709_extract_mempool_service
# Conflicts:
#	proxy/__main__.py
  • Loading branch information
rozhkovdmitrii committed Apr 11, 2022
commit 66b1124fb8431405d848cf3ce56baeade2e06cf9
3 changes: 2 additions & 1 deletion proxy/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@


import os
from .indexer.indexer import run_indexer
from .neon_proxy_app import NeonProxyApp
from .indexer.indexer_app import run_indexer


if __name__ == '__main__':
solana_url = os.environ['SOLANA_URL']
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.