merging and fixing conflict

Marc Garcia · Marc Garcia · commit 7d150580f301 · 2018-02-05T17:52:58.000Z
diff --git a/_config.yml b/_config.yml
@@ -1 +1,3 @@
 include: ["docs/_static", "docs/pandas-doc/build/_static"]
+
+theme: jekyll-theme-slate

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`include: ["docs/_static", "docs/pandas-doc/build/_static"]`
	`2`	`+`
	`3`	`+theme: jekyll-theme-slate`