From 87054c8121900532bdcc878bf90735e60f631014 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 10 May 2014 09:10:58 +0200
Subject: [PATCH] Make sure line-endings for Puppet manifests are LFs only.

fixes #6181
---
 .gitignore                     | 3 ++-
 .vagrant-puppet/.gitattributes | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .vagrant-puppet/.gitattributes

diff --git a/.gitignore b/.gitignore
index d57bdee03..fbbc7a3e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 # Exclude all hidden files
 .*
-# But not .gitignore, .vagrant-puppet, .htaccess and .gitkeep
+# But not .gitignore, .gitattributes, .vagrant-puppet, .htaccess and .gitkeep
 !.gitignore
+!.gitattributes
 !.vagrant-puppet
 !public/.htaccess
 !public/.htaccess.in
diff --git a/.vagrant-puppet/.gitattributes b/.vagrant-puppet/.gitattributes
new file mode 100644
index 000000000..af67531d8
--- /dev/null
+++ b/.vagrant-puppet/.gitattributes
@@ -0,0 +1 @@
+* -crlf