Skip to content

Commit

Permalink
Merge branch 'hotfix/issue-303-etl-not-compatible-with-arduino-ide' i…
Browse files Browse the repository at this point in the history
…nto development

# Conflicts:
#	support/Release notes.txt
#	test/vs2019/etl.vcxproj.filters
  • Loading branch information
jwellbelove committed Dec 8, 2020
1 parent 4d1f56b commit e425e25
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
###############################################################################
* text=auto

###############################################################################
# Declare files that will always have LF line endings on checkout.
###############################################################################
*.sh text eol=lf

###############################################################################
# Set default behavior for command prompt diff.
#
Expand Down

0 comments on commit e425e25

Please sign in to comment.