From b7d6ef6b33b39d514193c8ac89109f5faf1a46a5 Mon Sep 17 00:00:00 2001
From: eblondel <emmanuel.blondel1@gmail.com>
Date: Fri, 21 Feb 2020 23:46:21 +0100
Subject: [PATCH] #167

---
 R/ISOAbstractObject.R | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/R/ISOAbstractObject.R b/R/ISOAbstractObject.R
index 45c29ee7..9ff0bfce 100644
--- a/R/ISOAbstractObject.R
+++ b/R/ISOAbstractObject.R
@@ -224,11 +224,7 @@ ISOAbstractObject <- R6Class("ISOAbstractObject",
       if(suppressWarnings(all(class(value)==c("POSIXct","POSIXt")))){
         tz <- attr(value, "tzone")
         if(length(tz)>0){
-<<<<<<< HEAD
           if(tz %in% c("UTC","GMT")){
-=======
-          if(tz=="UTC"){
->>>>>>> b4fb290cdef7d210e91537aabbac51f6f20b2901
             value <- format(value,"%Y-%m-%dT%H:%M:%S")
             value <- paste0(value,"Z")
           }else{