tree d29b9b06626795d89a547bb8d10c72c22161e1a0
parent 2c68cd4acfecdf6bd0d0167b334c9241786f1436
parent c9c44a969d2cd6205313a519cabb13ad86fd3982
author Shedimus <sheaconnell@gmail.com> 1548109600 +0000
committer Shedimus <sheaconnell@gmail.com> 1548109600 +0000

Bungled the commit

Merge branch 'master' of https://github.com/Shedimus/posterdown

# Conflicts:
#	inst/rmarkdown/templates/posterdown_pdf/skeleton/skeleton.Rmd