From 6c74a9e475142cffafaee98506c2f56c03ab3d33 Mon Sep 17 00:00:00 2001
From: Gregory Ashton <gregory.ashton@ligo.org>
Date: Fri, 8 Feb 2019 14:03:26 +1100
Subject: [PATCH] Attempt to fix broken merge

---
 bilby/gw/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bilby/gw/__init__.py b/bilby/gw/__init__.py
index abe92cb1..9facdc6e 100644
--- a/bilby/gw/__init__.py
+++ b/bilby/gw/__init__.py
@@ -1,5 +1,5 @@
 from . import (calibration, conversion, cosmology, detector, likelihood, prior,
-               result, series, source, utils, waveform_generator)
+               result, source, utils, waveform_generator)
 
 
 from .waveform_generator import WaveformGenerator
-- 
GitLab