From eff653b1032a0965d73f3b67f742533d8b62cc08 Mon Sep 17 00:00:00 2001
From: Colm Talbot <colm.talbot@ligo.org>
Date: Wed, 16 May 2018 16:01:37 +1000
Subject: [PATCH] remove vestiges of conflict resolution
---
tupak/waveform_generator.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tupak/waveform_generator.py b/tupak/waveform_generator.py
index c7827f697..578c11b90 100644
--- a/tupak/waveform_generator.py
+++ b/tupak/waveform_generator.py
@@ -24,15 +24,10 @@ class WaveformGenerator(object):
"""
-# <<<<<<< HEAD
-# def __init__(self, frequency_domain_source_model=None, time_domain_source_model=None,
-# sampling_frequency=4096, time_duration=1, parameters=None, parameter_conversion=None):
-# =======
def __init__(self, time_duration, sampling_frequency, frequency_domain_source_model=None,
time_domain_source_model=None, parameters=None, parameter_conversion=None):
self.time_duration = time_duration
self.sampling_frequency = sampling_frequency
-# >>>>>>> master
self.frequency_domain_source_model = frequency_domain_source_model
self.time_domain_source_model = time_domain_source_model
self.time_duration = time_duration
--
GitLab