From 95c98166ec15fa57ad62f1298c4afc9d8d98fc23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Oct 2013 16:45:25 +0200
Subject: [PATCH] Merge .gitignore files

---
 .gitignore       | 1 +
 nixos/.gitignore | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 nixos/.gitignore

diff --git a/.gitignore b/.gitignore
index 165e92c7fc32..105e621d7021 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 e75fb319980e..000000000000
--- a/nixos/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-.version-suffix