From 3ff777cf23391b0e3c93224255aa9faac010489c Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 9 Apr 2020 13:15:28 -0700
Subject: [PATCH] merge .gitignore

---
 .gitignore      | 7 +++++++
 snap/.gitignore | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 snap/.gitignore

diff --git a/.gitignore b/.gitignore
index 6505e716c..064e7fffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,10 @@ tests/letstest/venv3/
 .certbot_test_workspace
 **/assets/pebble*
 **/assets/challtestsrv*
+
+# snap files
+.snapcraft
+parts
+prime
+stage
+*.snap
diff --git a/snap/.gitignore b/snap/.gitignore
deleted file mode 100644
index 2a339aeaa..000000000
--- a/snap/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.snapcraft
-parts
-prime
-stage
-*.snap
-certbot
-venv
-.idea