Skip to content
Snippets Groups Projects
Commit 183396d8 authored by Ben Anderson's avatar Ben Anderson
Browse files

fixed merge & code for pages 

Merge branch 'master' of github.com:dataknut/weGotThePower

# Conflicts:
#	paper/makePages.R
parents 9b4aca85 2febb1f0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment