From 5c2744238c95d7506a20854f6f3696ff753732ac Mon Sep 17 00:00:00 2001
From: Ray <rayliu109@gmail.com>
Date: Sun, 4 Mar 2018 00:01:57 -0500
Subject: [PATCH] Fixed merge texts
---
src/biotree/WormsAPI.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/biotree/WormsAPI.java b/src/biotree/WormsAPI.java
index 2ae560c..63f5e26 100644
--- a/src/biotree/WormsAPI.java
+++ b/src/biotree/WormsAPI.java
@@ -73,7 +73,7 @@ public class WormsAPI {
* @throws IOException
* @throws ParseException
*/
-<<<<<<< HEAD
+
public static TaxonNode[] idToClassification(int taxonId) throws IOException, ParseException {
String resp = makeRequest(String.format("http://marinespecies.org/rest/AphiaClassificationByAphiaID/%d", taxonId));
JSONParser parser = new JSONParser();
@@ -85,9 +85,6 @@ public class WormsAPI {
TaxonNode[] copiedArray = new TaxonNode[arraysize];
System.arraycopy(taxnodes, 0, copiedArray, 0, arraysize);
-=======
- public static TaxonNode[] idToClassification(int taxonId) {
->>>>>>> 7713da5ef410b951f64f9d9fda4937386132f0a0
return copiedArray;
--
GitLab