diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /.guix-authorizations | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to '.guix-authorizations')
| -rw-r--r-- | .guix-authorizations | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.guix-authorizations b/.guix-authorizations index 486798359d..fff75fb6d1 100644 --- a/.guix-authorizations +++ b/.guix-authorizations @@ -86,8 +86,6 @@ (;; primary: "4F71 6F9A 8FA2 C80E F1B5 E1BA 5E35 F231 DE1A C5E0" "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08" (name "lfam")) - ("148B CB8B D80B FB16 B1DE 0E91 45A8 B1E8 6BCD 10A6" - (name "lle_bout")) ("8887 84C4 1459 ACCB 83E7 E84C 634C 6E89 79FA BEC2" (name "m1gu3l")) ("CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D" |