Adding docs that will build via Github Pages (tableau#100)

* Jekyll Dependencies * First draft of docs -- we'll improve once skeleton is in place * Does not deploy yet, need to do that in github settings page
bryceglarsen · Nov 1, 2016 · 2e35547 · 2e35547
1 parent 6ee666b
commit 2e35547
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/docs/dev-guide.md b/docs/docs/dev-guide.md
@@ -3,6 +3,7 @@ title: Developer Guide
 layout: docs
 ---
 
+<<<<<<< 6ee666bf06d5ab59931100b3955779c35693e33f
 ## Submitting your first patch
 
 1. Make sure you have [signed the CLA](http://tableau.github.io/#contributor-license-agreement-cla)