update

DESCRIPTION

@@ -2,7 +2,7 @@ Package: GenomeFeatures
 Version: 1.0
 Title: Multiple genomic features annotations
 Author: Aurelien Brionne [aut, cre]
-Maintainer: Aurelien Brionne <aurelien.brionne@inra.fr>
+Maintainer: Aurelien Brionne <aurelien.brionne@inrae.fr>
 Depends: R (>= 3.6)
 Imports: AnnotationDbi,
         BiocGenerics,
@@ -29,7 +29,11 @@ VignetteBuilder: knitr
 License: GPL-3
 URL: https://forgemia.inra.fr/aurelien.brionne/GenomeFeatures
 BugReports: https://forgemia.inra.fr/aurelien.brionne/GenomeFeatures/issues
+<<<<<<< HEAD
 RoxygenNote: 7.1.1
+=======
+RoxygenNote: 7.1.0
+>>>>>>> a1bed8b25cbc1b31ad4c962fe03a6ea43d5110f6
 Collate: 
     'GFF_att.R'
     'overlapped_genome_features.R'

R/genome_features_overlaps.R

@@ -29,7 +29,7 @@
 #' @exportMethod genome_features_overlaps
 setGeneric(
     name="genome_features_overlaps",
-    def=function(peaks,features,figs_path="./data/figs/",ignore.strand=TRUE){
+    def=function(peaks,features,figs_path=".",ignore.strand=TRUE){
         standardGeneric("genome_features_overlaps")
     }
 )
@@ -381,8 +381,6 @@ setMethod(
             dev.off()
         })
 
-        ## create overlapped_genome_features
-
         # createoverlapped_ genome_features
         new(
             "overlapped_genome_features",

man/genome_features_overlaps-methods.Rd

@@ -8,14 +8,22 @@
 genome_features_overlaps(
   peaks,
   features,
+<<<<<<< HEAD
   figs_path = "./data/figs/",
+=======
+  figs_path = ".",
+>>>>>>> a1bed8b25cbc1b31ad4c962fe03a6ea43d5110f6
   ignore.strand = TRUE
 )
 
 \S4method{genome_features_overlaps}{CompressedGRangesList,genome_features}(
   peaks,
   features,
+<<<<<<< HEAD
   figs_path = "./data/figs/",
+=======
+  figs_path = ".",
+>>>>>>> a1bed8b25cbc1b31ad4c962fe03a6ea43d5110f6
   ignore.strand = TRUE
 )
 }