summaryrefslogtreecommitdiffstats
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
commit4f040fd34aaa701679b4140a187551f527fe18a2 (patch)
treec91be72406d0e9238a61e66a43178ca629f2db5c
parent0a2ddb6699f08a27e70cc88fddffe1b031fb77ac (diff)
parentc45f0fc97c97a673641e6b42a16c46b1dfabdba8 (diff)
Merge remote-tracking branch 'lass/20.03' into 20.03
-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 b3b3355..dec6956 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