changelog.txt merge=ours
addon.xml merge=ours

# This ensures that all files that git considers to be text will have
# normalized (LF) line endings in the repository
* text eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.ttf binary
*.wav binary
*.mp3 binary
*.xbt binary