Merge branch 'develop' of 134.147.164.251:/data/git/pylot into develop
Conflicts: pylot/core/util/utils.py
This commit is contained in:
commit
d5c9ad41be
@ -115,6 +115,7 @@ def createEvent(origintime, cinfo, etype, resID=None, authority_id=None):
|
|||||||
event.creation_info = cinfo
|
event.creation_info = cinfo
|
||||||
event.event_type = etype
|
event.event_type = etype
|
||||||
return event
|
return event
|
||||||
|
def createPick(picknum, picktime, eventnum, cinfo, phase, station, wfseedstr,
|
||||||
|
|
||||||
|
|
||||||
def createPick(origintime, picknum, picktime, eventnum, cinfo, phase, station,
|
def createPick(origintime, picknum, picktime, eventnum, cinfo, phase, station,
|
||||||
|
Loading…
Reference in New Issue
Block a user