commit:     ff789b04838a22da75ec5510ba38c0f7ebeffbef
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 19:45:43 2014 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 19:45:43 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/maekke.git;a=commit;h=ff789b04

merge .gitignore files

---
 .gitignore         | 1 +
 scripts/.gitignore | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a01ee28..a86a8d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .*.swp
+*.txt

diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644
index 2211df6..0000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt

Reply via email to