From 2c3af5b4c0e9e6ea7485b88fe58d3d31de45278b Mon Sep 17 00:00:00 2001
From: Marcel Raad <raad@teamviewer.com>
Date: Tue, 21 Mar 2017 23:20:03 +0100
Subject: .gitattributes: turn off CRLF for *.am

If Makefile.am uses CRLF, buildconf in a Windows checkout fails with:
".ibtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with
ACLOCAL_AMFLAGS=-I m4"
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index a7b3f6a28..e84adeec3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@ buildconf eol=lf
 configure.ac eol=lf
 *.m4 eol=lf
 *.in eol=lf
+*.am eol=lf
-- 
cgit v1.2.3