summaryrefslogtreecommitdiffstats
path: root/nixpkgs/pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-02-12 22:03:29 +0100
committermakefu <github@syntax-fehler.de>2016-02-12 22:03:29 +0100
commit1c850bb26f931224eceb1dd35e620e0f5aeb19ed (patch)
tree946654504280fe8a9a2a0b66df8116e7b583ae2b /nixpkgs/pkgs
parent08b03ef2e7dc6eff237c213ee341d0da6b9a0d96 (diff)
parent1497ee718256ff48c65ebcb0ddea633c6628eb69 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'nixpkgs/pkgs')
l---------nixpkgs/pkgs1
1 files changed, 0 insertions, 1 deletions
diff --git a/nixpkgs/pkgs b/nixpkgs/pkgs
deleted file mode 120000
index 983384943..000000000
--- a/nixpkgs/pkgs
+++ /dev/null
@@ -1 +0,0 @@
-../../upstream-nixpkgs/pkgs \ No newline at end of file