From f6791135aef2c4bbb4afa70349f6a783da09f84e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?benjamin=20melan=C3=A7on?= <ben@agaric.com>
Date: Wed, 5 Aug 2020 14:46:08 -0400
Subject: [PATCH] Restore update ddev-generated .gitignore

From commit e4534b8

This was lost because git checkout --theirs -- flat out didn't work.  What?
---
 .ddev/.gitignore | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/.ddev/.gitignore b/.ddev/.gitignore
index bf003b6..9e2104b 100644
--- a/.ddev/.gitignore
+++ b/.ddev/.gitignore
@@ -1,24 +1,28 @@
 #ddev-generated: Automatically generated ddev .gitignore.
 # You can remove the above line if you want to edit and maintain this file yourself.
-
-/commands/*/*.example
-/commands/*/README.txt
-/commands/host/launch
-/commands/web/xdebug
-/commands/db/mysql
-/homeadditions/*.example
-/homeadditions/README.txt
 /.gitignore
-/import.yaml
+
+/**/*.example
+/.dbimageBuild
+/.dbimageExtra
 /.ddev-docker-compose-base.yaml
 /.ddev-docker-compose-full.yaml
-/db_snapshots
-/sequelpro.spf
-/import-db
-/config.*.y*ml
-/.webimageBuild
-/.dbimageBuild
+/.ddevlive-downloads
+/.global_commands
+/.homeadditions
 /.sshimageBuild
+/.webimageBuild
 /.webimageExtra
-/.dbimageExtra
-/*-build/Dockerfile.example
+/apache/apache-site.conf
+/commands/.gitattributes
+/commands/db/mysql
+/commands/host/launch
+/commands/web/live
+/commands/web/xdebug
+/config.*.y*ml
+/db_snapshots
+/import-db
+/import.yaml
+/nginx_full/nginx-site.conf
+/sequelpro.spf
+/**/README.*