summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-02-28 09:34:34 +0100
committerlassulus <lassulus@lassul.us>2018-02-28 09:34:34 +0100
commit793742b9d1b2eab942e5d06ed27028c636cda583 (patch)
treea03346a78c60212faa190f4d9ae146ef5a2d6324
parent2944eae45a7c3c76bb5af8ebe0854be21b66570b (diff)
parentcf2d31899e7341939f59a16ff7c3386f70449fd3 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--.gitignore1
l---------makefu/5pkgs/awesomecfg/result1
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e1c6ef949..d17552e83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.graveyard
/TODO
+result
diff --git a/makefu/5pkgs/awesomecfg/result b/makefu/5pkgs/awesomecfg/result
deleted file mode 120000
index b6e72501a..000000000
--- a/makefu/5pkgs/awesomecfg/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/w7c49s795z5g4j9fwq05a0bck0pbkz3h-awesome_full_config \ No newline at end of file