summaryrefslogtreecommitdiffstats
path: root/jeschli
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-04-22 16:06:31 +0200
committermakefu <github@syntax-fehler.de>2020-04-22 16:06:31 +0200
commitecb005be972d342a40261b693d33579735e1b2d8 (patch)
tree71555b0d4cdf76b31599d14ab9e038cadf01d108 /jeschli
parent7d62165696171c2a827428798af5e9734c08298b (diff)
parentd5851b50c589a18281081212b18533fb6b0d1c43 (diff)
Merge remote-tracking branch 'lass/20.03' into 20.03
Diffstat (limited to 'jeschli')
-rw-r--r--jeschli/1systems/reagenzglas/config.nix1
m---------jeschli/2configs/elisp0
2 files changed, 0 insertions, 1 deletions
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index b3b335585..dec69563f 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -7,7 +7,6 @@
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/firefox.nix>
<stockholm/jeschli/2configs/rust.nix>
- <stockholm/jeschli/2configs/haskell.nix>
<stockholm/jeschli/2configs/steam.nix>
<stockholm/jeschli/2configs/python.nix>
./desktop.nix
diff --git a/jeschli/2configs/elisp b/jeschli/2configs/elisp
-Subproject ae1a03ddee80d73ac166af75cdb1d93d24fa44b
+Subproject 279d6a01f5abbab5d28d3a57549b7fec800a510