From 2644536a24f37d3906c7ea56e57f6965b1e21f36 Mon Sep 17 00:00:00 2001
From: Karl Horky <karl.horky@gmail.com>
Date: Thu, 24 Oct 2019 18:31:35 +0200
Subject: [PATCH] Comment out / add note about conflicting gitignore lines
 (#3204)

* Remove conflicting gitignore lines, add reference

Ref (introduction of a new "public" folder in Next.js):
https://nextjs.org/blog/next-9-1#public-directory-support

* Improve solution to conflicting files
---
 Node.gitignore                      | 11 +++++++----
 community/JavaScript/Nuxt.gitignore |  9 ---------
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 community/JavaScript/Nuxt.gitignore

diff --git a/Node.gitignore b/Node.gitignore
index 6fb487aa..67045665 100644
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -75,15 +75,18 @@ typings/
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 
-# next.js build output
+# Next.js build output
 .next
 
-# nuxt.js build output
+# Nuxt.js build / generate output
 .nuxt
+dist
 
-# gatsby files
+# Gatsby files
 .cache/
-public
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
 
 # vuepress build output
 .vuepress/dist
diff --git a/community/JavaScript/Nuxt.gitignore b/community/JavaScript/Nuxt.gitignore
deleted file mode 100644
index cd6c77a3..00000000
--- a/community/JavaScript/Nuxt.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# gitignore template for Nuxt.js projects
-#
-# Recommended template: Node.gitignore
-
-# Nuxt build
-.nuxt
-
- # Nuxt generate
-dist