From 95f6810d90aa8f2aa5b2662fc66c9bdfb6098a2f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@cs.put.poznan.pl>
Date: Thu, 16 Jun 2016 10:35:01 +0200
Subject: [PATCH] merge issues :)

---
 src/main/sources/VcfDataSource.js | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/main/sources/VcfDataSource.js b/src/main/sources/VcfDataSource.js
index 7f5a3f0b..a8329361 100644
--- a/src/main/sources/VcfDataSource.js
+++ b/src/main/sources/VcfDataSource.js
@@ -92,27 +92,15 @@ function createFromVcfFile(remoteSource: VcfFile): VcfDataSource {
   return o;
 }
 
-function create(data: Object): VcfDataSource {
-  var url = data.url;
-  var content = data.content;
-  if (url!==null && url!== undefined) {
+function create(data: {url?: string, content?: string}): VcfDataSource {
+  var {url, content} = data;
+  if (url) {
     return createFromVcfFile(new VcfFile(new RemoteFile(url)));
-  }
-  if (content!==null && content!== undefined) {
+  } else if (content) {
     return createFromVcfFile(new VcfFile(new LocalStringFile(content)));
   }
-  throw new Error(`Missing URL from track: ${JSON.stringify(data)}`);
-}
-
-function create(data: {url?: string, content?: string}): VcfDataSource {
-  var {url, content} = data;
-	if (url) {
-	  return createFromVcfFile(new VcfFile(new RemoteFile(url)));
-	} else if (content) {
-	  return createFromVcfFile(new VcfFile(new LocalStringFile(content)));
-	}
-	// If no URL or content is passed, fail
-	 throw new Error(`Missing URL or content from track: ${JSON.stringify(data)}`);
+  // If no URL or content is passed, fail
+  throw new Error(`Missing URL or content from track: ${JSON.stringify(data)}`);
 }
 
 module.exports = {