Browse code

fixed conflict

From: Kasper Daniel Hansen <kasperdanielhansen@gmail.com>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/bsseq@110074 bc3139a8-67e5-0310-9ffc-ced21a209358

khansen authored on 29/10/2015 19:12:43
Showing 1 changed files
... ...
@@ -1,2 +1,3 @@
1 1
 ^.*\.Rproj$
2 2
 ^\.Rproj\.user$
3
+.travis.yml
Browse code

Commit made by the Bioconductor Git-SVN bridge.

Commit id: 21404fe8275c89f6f29231a680703827b0796ff9

Merge pull request #4 from PeteHaitch/master

Updates to read.bismark(), mostly documentation

Commit id: 6ba560784b0e6e6f2e8c40de72b4abf516dc14e3

Update tests and examples to use gzipped data. Ensure strand is kept for cytosineReport files if collapseStrand = FALSE.


Commit id: 41b003506ba63d0c7ec330c2ea0b826e0c1c5e9c

Remove Travis-CI. Not relevant at this juncture.


Commit id: 2fd84392d9f39409b6958f0ce0d77ea5e6476bee

Hardcode RVERSION in .travis.yml


Commit id: 127bc93e92cd065e94dbeac0001949e5c4138d91

Experimental Travis-CI support.


Commit id: a6fecb9692f9b72093d3e0e79cf39e325d63b1e9

Second pass at updating read.bismark() and docs. Updated DESCRIPTION in light of changes and added NEWS.rd entry.


Commit id: 5af9b047653567816174480a6f405e1d02f0a74b

First pass at re-write of read.bismark() and associated docs.



git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/bsseq@106909 bc3139a8-67e5-0310-9ffc-ced21a209358

khansen authored on 30/07/2015 01:16:09
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,2 @@
1
+^.*\.Rproj$
2
+^\.Rproj\.user$