fixed conflicts

lifeomic · Nov 8, 2017 · 9e0730f · 9e0730f
2 parents 8bcf8bd + f108dd3
commit 9e0730f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/main/scala/com/lifeomic/variants/VCFResourceRelation.scala b/src/main/scala/com/lifeomic/variants/VCFResourceRelation.scala
@@ -83,7 +83,6 @@ class VCFResourceRelation(
     private val annotations = vcf.filter(col(TEXT_VALUE).startsWith("##INFO")).map(_.getString(1)).rdd.map(VCFFunctions.metaHandler("##INFO="))
     private var annotationCount = 1
 
-
     /*
       * order is
       * 0. chromosome