Merge pull request chocolatey-archive#74 from glennsarti/fix-crlf-syn…

…c-yml (MAINT) Fix .gitattributes for module development on Windows
ferventcoder · Mar 30, 2017 · 5e3af24 · 5e3af24
2 parents ac476f7 + 810f566
commit 5e3af24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,4 @@
 #This file is generated by ModuleSync, do not edit.
 *.rb eol=lf
-*.erb eol=lf
 *.pp eol=lf
 *.sh eol=lf
diff --git a/.sync.yml b/.sync.yml
@@ -24,6 +24,11 @@
     - "/.vscode/"
     - ".config"
 
+.gitattributes:
+  # As this is for Windows, ERB files can be either LF or CRLF
+  exclude:
+  - "*.erb"
+
 Gemfile:
   optional:
     ':system_tests':