mirror of
https://github.com/haml/haml.git
synced 2022-11-09 12:33:31 -05:00
Added .gitattributes
This is to avoid merge conflicts on version.rb
This commit is contained in:
parent
08c2e803bb
commit
162f230989
1 changed files with 1 additions and 0 deletions
1
lib/haml/.gitattributes
vendored
Normal file
1
lib/haml/.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
version.rb merge=ours
|
Loading…
Reference in a new issue