[gnunet] branch master updated: -fix make dist; update gitignore to ignore tarballs

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new b3f290473 -fix make dist; update gitignore to ignore tarballs
     new 9e5b5a11d Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
b3f290473 is described below

commit b3f29047339960047f1410b2b89a4dad769b7522
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Nov 23 14:15:43 2022 +0900

    -fix make dist; update gitignore to ignore tarballs
---
 .gitignore          | 1 +
 contrib/Makefile.am | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0a4729e68..e38f0ccd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 \#*\#
+gnunet-*.tar.gz
 *vgcore.*
 *.bak
 *.a
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index fbbc919bd..acfea9365 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -225,7 +225,6 @@ EXTRA_DIST = \
   docker/docker-entrypoint.sh \
   docker/Dockerfile \
   docker/README.md \
-  docker/gnunet.conf \
   benchmark/collect.awk \
   get_version.sh \
   gnunet_infrastructure/handbook_pull.sh \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.