[fix] fixing docstring problem caused by merge of conflicting files

This commit is contained in:
Sebastian Wehling-Benatelli 2016-05-18 13:17:05 +02:00
parent eb5f028a47
commit dc5d76efb8

View File

@ -193,7 +193,7 @@ def picksdict_from_obs(fn):
def picksdict_from_picks(evt): def picksdict_from_picks(evt):
''' """
Takes an Event object and return the pick dictionary commonly used within Takes an Event object and return the pick dictionary commonly used within
PyLoT PyLoT
:param evt: Event object contain all available information :param evt: Event object contain all available information