[incubator-datasketches-website] 08/12: update website

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-website.git

commit 7945b47523ba6fc82549e1fbf709c8d69e06ff61
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Jan 23 12:05:34 2020 -0800

    update website
---
 .gitignore | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 367c43c..cc1a9cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,3 @@
-<<<<<<< HEAD
-# Jekyll
-_site
-.sass-cache
-.jekyll-metadata
-about.md
-Gemfile
-Gemfile.lock
-_posts/
-
-# Eclipse
-.project
-
-# yml files
-
-/local/
-.DS_Store
-=======
 # Eclipse project files 
 .classpath
 .project
@@ -56,5 +38,3 @@ vendor/
 .paper/
 tmp/
 /local/
-
->>>>>>> branch 'master' of git@github.com:apache/incubator-datasketches-website.git


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org