sources.py edit

bigdatagenomics · Sep 4, 2019 · 2d524c9 · 2d524c9
1 parent 63d5929
commit 2d524c9
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/mango-viz/bdgenomics/mango/pileup/sources.py b/mango-viz/bdgenomics/mango/pileup/sources.py
@@ -38,12 +38,8 @@
     GA4GHVariantSource
     GA4GHFeatureSource
 """
-<<<<<<< HEAD
 
 from bdgenomics.mango.io import *
-=======
-from bdgenomics.io.io import *
->>>>>>> 9f6c493... sources.py changes
 
 # generic data source for pileup.js
 class Source:
@@ -93,12 +89,7 @@ def __init__(self, dataframe):
         Args:
             :param dataframe: dataframe
         """
-<<<<<<< HEAD
-
         feature_transformed_json = dataframe._mango_to_json
-=======
-        feature_transformed_json = read_bed(dataframe)._mango_to_json
->>>>>>> 9f6c493... sources.py changes
         self.dict_ = feature_transformed_json
 
         #: name that pileup.js uses to identify sources --> temporary