From 61c7e9f4172996155eea50172192c6e585047236 Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Thu, 17 Sep 2015 11:07:22 +0200 Subject: [PATCH] removed stashed changes --- pylot/core/pick/utils.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index 80277623..b78d7946 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -43,13 +43,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None): LPick = None EPick = None PickError = None -<<<<<<< Updated upstream - print ("earllatepicker: Get earliest and latest possible pick relative to most likely pick ...") -======= - # MP MP ++ output suppressed #print 'earllatepicker: Get earliest and latest possible pick relative to most likely pick ...' - # MP MP -- ->>>>>>> Stashed changes x = X[0].data t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate,