From 587a3ff6c0745d60bce98afd553dc5bba84f3976 Mon Sep 17 00:00:00 2001
From: Brian Hulette <bhulette@google.com>
Date: Thu, 7 Jan 2021 16:45:37 -0800
Subject: [PATCH] [BEAM-11582] Merge website/.gitignore into .gitignore
 (#13697)

---
 .gitignore         | 10 ++++++++++
 website/.gitignore | 23 -----------------------
 2 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 website/.gitignore

diff --git a/.gitignore b/.gitignore
index a8933b21a152..faaab28aa20b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,13 @@ sdks/python/coverage.xml
 
 .pytest_cache
 .pytest_cache/**/*
+
+# Hugo
+website/www/node_modules
+website/www/dist
+website/www/site/resources
+website/www/site/github_samples
+website/www/site/code_samples
+website/www/site/_config_branch_repo.toml
+website/www/yarn-error.log
+!website/www/site/content
diff --git a/website/.gitignore b/website/.gitignore
deleted file mode 100644
index bbed591c748a..000000000000
--- a/website/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-_site
-.doctrees
-.sass-cache
-.jekyll-metadata
-vendor/
-.bundle/
-content/
-
-# Ignore IntelliJ files.
-.idea/
-*.iml
-*.ipr
-*.iws
-
-# Hugo
-www/node_modules
-www/dist
-www/site/resources
-www/site/code_samples
-www/site/_config_branch_repo.toml
-www/yarn-error.log
-!www/site/content
-