kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-27 17:30:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove <<<<<< from merge

Browse Source
This commit is contained in:
Jude Nelson
2018-06-20 18:50:02 -04:00
parent 57153b9d3a
commit 6648ec84a1
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
blockstack/lib/client.py
View File

@@ -904,7 +904,6 @@ def put_zonefiles(hostport, zonefile_data_list, timeout=30, my_hostport=None, pr
return push_info
<<<<<<< HEAD
def get_zonefiles_by_block(from_block, to_block, hostport=None, proxy=None):
"""
Get zonefile information for zonefiles announced in [@from_block, @to_block]