From dc5d76efb86889f21043fed859934858847aee25 Mon Sep 17 00:00:00 2001
From: Sebastian Wehling-Benatelli <sebastian.wehling@rub.de>
Date: Wed, 18 May 2016 13:17:05 +0200
Subject: [PATCH] [fix] fixing docstring problem caused by merge of conflicting
 files

---
 pylot/core/io/phases.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pylot/core/io/phases.py b/pylot/core/io/phases.py
index bf2ba499..3924ddd3 100644
--- a/pylot/core/io/phases.py
+++ b/pylot/core/io/phases.py
@@ -193,7 +193,7 @@ def picksdict_from_obs(fn):
 
 
 def picksdict_from_picks(evt):
-    '''
+    """
     Takes an Event object and return the pick dictionary commonly used within
     PyLoT
     :param evt: Event object contain all available information