[Bioc-devel] Git merge conflict tags in certain packages. Please remove.

[Turaga, Nitesh]

Hi Maintainers of the following packages,

 bioCancer
 Cardinal
 deltaGseg
 discordant
 DMRcate
 erccdashboard
 EventPointer
 ggtree
 gtrellis
 metagenomeFeatures
 OmicsMarkeR
 polyester
 ReportingTools
 rpx


You have git merge conflict tags committed to your repository. Please makes sure these are removed.  I’m pasting the list of locations in these packages. But as a note to maintainers, these issues will propagate if not removed and cause problems.


bioCancer/inst/bioCancer/data/.gitignore:<<<<<<< HEAD
bioCancer/inst/quant/tools/help/regression.md:<<<<<<< HEAD
bioCancer/inst/quant/tools/help/regression.Rmd:<<<<<<< HEAD
bioCancer/inst/quant/tools/help/figures/.gitignore:<<<<<<< HEAD
bioCancer/inst/quant/tools/help/compare_props.md:<<<<<<< HEAD
bioCancer/inst/quant/tools/help/compare_props.md:<<<<<<< HEAD
Cardinal/NEWS:<<<<<<< HEAD
Cardinal/NEWS:<<<<<<< HEAD
Cardinal/NEWS:<<<<<<< HEAD
deltaGseg/inst/NEWS:<<<<<<< HEAD
discordant/vignettes/Discordant_vignette.Rnw:<<<<<<< HEAD
DMRcate/man/cpg.annotate.Rd:<<<<<<< HEAD
erccdashboard/NEWS~:<<<<<<< HEAD
EventPointer/inst/CITATION.orig:<<<<<<< HEAD
ggtree/.Rbuildignore:<<<<<<< HEAD
gtrellis/vignettes/gtrellis.Rmd:<<<<<<< HEAD
metagenomeFeatures/inst/scripts/make_mockMgDb.R:<<<<<<< HEAD
metagenomeFeatures/inst/scripts/make_mockMgDb.R:<<<<<<< HEAD
OmicsMarkeR/.Rbuildignore:<<<<<<< HEAD
OmicsMarkeR/OmicsMarkeR.Rproj:<<<<<<< HEAD
OmicsMarkeR/OmicsMarkeR.Rproj:<<<<<<< HEAD
polyester/.travis.yml:<<<<<<< HEAD
polyester/.travis.yml:<<<<<<< HEAD
ReportingTools/man/Link.Rd:<<<<<<< HEAD
rpx/.travis.yml:<<<<<<< HEAD

Best,

Nitesh

This email message may contain legally privileged and/or confidential information.  If you are not the intended recipient(s), or the employee or agent responsible for the delivery of this message to the intended recipient(s), you are hereby notified that any disclosure, copying, distribution, or use of this email message is prohibited.  If you have received this message in error, please notify the sender immediately by e-mail and delete this email message from your computer. Thank you.