summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2017-10-13 14:22:08 +0200
committerVarac <varac@leap.se>2017-10-13 14:22:08 +0200
commitf7779ce2eacaca51790d4e8d7756442b02612d30 (patch)
tree56871c123e1c964fc26e36bb86831a4a3511bd4f /.gitattributes
parent066c08f8362d53f0f30897cb8710d11260c726ea (diff)
parent2339ea8db67ac7ef02d707c2a6011ae50f5d82b5 (diff)
Merge remote-tracking branch 'origin/master' into leap_masterHEADmaster
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 900ea0c..02d4646 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
#This file is generated by ModuleSync, do not edit.
-*.rb eol=lf
+*.rb eol=lf
*.erb eol=lf
-*.pp eol=lf
-*.sh eol=lf
+*.pp eol=lf
+*.sh eol=lf