diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
| commit | 129b9b16d9b588316cc997cf8f4fefe30961a417 (patch) | |
| tree | bc1dc50e83af6e9afb2ee24cd32f5e42e039642e /.dir-locals.el | |
| parent | 5f9c92dd6285a1ef326cf5aa99781f1f3acbd245 (diff) | |
| parent | 9113de2ca2db195908e3262b3752f8392ada8630 (diff) | |
| download | guix-129b9b16d9b588316cc997cf8f4fefe30961a417.tar guix-129b9b16d9b588316cc997cf8f4fefe30961a417.tar.gz | |
Merge remote-tracking branch 'origin/version-1.2.0' into master
Conflicts:
gnu/packages/bioinformatics.scm
The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index bad3900a96..4eb27d8b1b 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -134,7 +134,6 @@ (eval . (put 'call-with-progress-reporter 'scheme-indent-function 1)) (eval . (put 'with-repository 'scheme-indent-function 2)) (eval . (put 'with-temporary-git-repository 'scheme-indent-function 2)) - (eval . (put 'with-temporary-git-worktree 'scheme-indent-function 2)) (eval . (put 'with-environment-variables 'scheme-indent-function 1)) (eval . (put 'with-fresh-gnupg-setup 'scheme-indent-function 1)) |