Merge remote-tracking branch 'origin/master'

# Conflicts: # DESCRIPTION # R/hiReadsProcessor.R
malnirav · Sep 12, 2017 · 45f158f · 45f158f
2 parents 6649444 + b0c9d81
commit 45f158f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,12 @@
 Package: hiReadsProcessor
 Title: Functions to process LM-PCR reads from 454/Illumina data
+<<<<<<< HEAD
 Version: 1.13.0
 Date: 2016-05-05
+=======
+Version: 1.3.0
+Date: 2015-04-02
+>>>>>>> origin/master
 Author: Nirav V Malani <[email protected]>
 Maintainer: Nirav V Malani <[email protected]>
 Description: hiReadsProcessor contains set of functions which allow

diff --git a/R/hiReadsProcessor.R b/R/hiReadsProcessor.R
@@ -489,7 +489,11 @@ replicateReads <- function(dnaSet, counts = NULL) {
     if(is.null(names(dnaSet))) {
       stop("No names attribute found in dnaSet object")
     }
+<<<<<<< HEAD
     counts <- as.numeric(sub(".+counts=(\\d+)", "\\1", names(dnaSet)))
+=======
+    counts <- as.numeric(sub(".+counts=(\\d+).*","\\1", names(dnaSet)))
+>>>>>>> origin/master
     if(all(is.na(counts))) {
       warning("No counts=\\d+ marker found at the end of definition line or ",
               "names attribute in dnaSet object. Defaulting to count=1")