MattTheTekie/trumptracker.github.io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into jekyll

Browse source 
Conflicts:
	.gitignore
	about.html
	index.html
This commit is contained in:
Alan Friedman 2016-11-13 18:33:43 -05:00
commit c749fe1531
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -134,8 +134,11 @@ dist/
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
<<<<<<< HEAD
# Jekyll
_site/
.sass-cache/
.jekyll-metadata
/.idea