From 3e4280e6e275a9680bdc247a6442d89a580cb4ef Mon Sep 17 00:00:00 2001 From: Adam Wright Date: Fri, 3 May 2019 18:46:04 +0000 Subject: [PATCH] fix to merge conflict --- src/rest_api/classes/generic_fields.clj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rest_api/classes/generic_fields.clj b/src/rest_api/classes/generic_fields.clj index e5648da4..88067b81 100644 --- a/src/rest_api/classes/generic_fields.clj +++ b/src/rest_api/classes/generic_fields.clj @@ -151,8 +151,7 @@ (map :cds/_corresponding-protein) (filter #(not= "history" (:method/id (:locatable/method %)))) (first) - (sequence-fns/genomic-obj)) - + (sequence-fns/genomic-obj))] (when-let [position (sequence-fns/genomic-obj object)] [position])) :description "The genomic location of the sequence"}))