From b75e7dbbfcb6f9a22335e2831411ff8734388487 Mon Sep 17 00:00:00 2001 From: Kashish Sharma Date: Tue, 24 Mar 2015 11:46:46 +0530 Subject: [PATCH] Committing all unstaged files before filter-branch Conflicts: .gitignore ac-comphist.dat --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 633f1da..aa1fd6a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *~ erc/logs/ -elpa/*readme.txt \ No newline at end of file +elpa/*readme.txt +elpa/ +elisp-git/