diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 16:45:25 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | 95c98166ec15fa57ad62f1298c4afc9d8d98fc23 (patch) | |
| tree | d2e9d534340da060ce911127b7287bec8152ef94 | |
| parent | c8628e09892acde58e5f4e6e2b1e317e248e9f10 (diff) | |
| download | nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar.gz nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar.bz2 nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar.lz nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar.xz nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.tar.zst nixpkgs-95c98166ec15fa57ad62f1298c4afc9d8d98fc23.zip | |
Merge .gitignore files
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | nixos/.gitignore | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 165e92c7fc3..105e621d702 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ doc/NEWS.html doc/NEWS.txt doc/manual.html doc/manual.pdf +.version-suffix diff --git a/nixos/.gitignore b/nixos/.gitignore deleted file mode 100644 index e75fb319980..00000000000 --- a/nixos/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -.version-suffix |