From 8b28c182392a2c94fa167c6df0418caee3b07372 Mon Sep 17 00:00:00 2001 From: Brian Carrier <carrier@sleuthkit.org> Date: Thu, 21 Aug 2014 22:47:27 -0400 Subject: [PATCH] Added gitignore to gitattributes to prevent line ending issues as reported in #317 --- .gitattributes | 2 ++ .gitignore | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 97a7235c9..b8acab7d4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,3 +25,5 @@ Doxyfile text *.vcxproj* text eol=crlf *.sln text eol=crlf +.gitignore text + diff --git a/.gitignore b/.gitignore index 3a80e1c3e..645277f82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # NetBeans user-specific settings /bindings/java/nbproject/private/ - + # Bindings dependecies and build folders /bindings/java/lib/ /bindings/java/build/ -- GitLab