From d72c0a1c3b3dd8ca8e5092f813a303749ee22038 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 3 Apr 2021 17:56:16 +0200
Subject: [PATCH] Update .gitattributes

*.conf text eol=lf
*.jpeg binary
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 4b0ed3d14b5..d1002263778 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,6 +18,7 @@
 *.pp text eol=lf
 *.sh text eol=lf
 *.yaml text eol=lf
+*.conf text eol=lf
 
 .bash_aliases text eol=lf
 
@@ -26,6 +27,7 @@
 *.ico binary
 *.png binary
 *.jpg binary
+*.jpeg binary
 *.odt binary
 *.odf binary
 *.frm binary