From 3cd211524811237de47b7ea586729a1d44be1679 Mon Sep 17 00:00:00 2001
From: Christian Pavese <cpav@dtu.dk>
Date: Tue, 3 May 2016 14:07:59 +0200
Subject: [PATCH] fixed bug

---
 wetb/prepost/Simulations.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wetb/prepost/Simulations.py b/wetb/prepost/Simulations.py
index 6e495172..bdc0cdf3 100755
--- a/wetb/prepost/Simulations.py
+++ b/wetb/prepost/Simulations.py
@@ -5193,7 +5193,6 @@ class Cases(object):
 
         return int_env
 
->>>>>>> 243fec873030daa39e892a424570111fbeaa9963
     def envelope(self, silent=False, ch_list=[], append=''):
         """
         Calculate envelopes and save them in a table.
-- 
GitLab