From 657f70339f3a4420a19d1c9b23681cc6f06af6df Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 20 Jun 2020 04:07:24 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 .gitignore |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e30d81..572e2af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,5 @@
-*~
-config.el
-elpa/*
-eshell/*
-semanticdb/*
-url/*
-srecode-map.el
-.last-package-update-day
-ede-projects.el
-network-security.data
-projectile-bookmarks.eld
-projectile.cache
-recentf
-irony*/
\ No newline at end of file
+/*
+!config.org
+!init.el
+!.gitignore
+!snippets
\ No newline at end of file

--
Gitblit v1.9.3