Skip to content

Commit

Permalink
Merge branch 'Remove-JiraIssue_264' of https://github.com/hmmwhatsthi…
Browse files Browse the repository at this point in the history
…sdo/JiraPS into Remove-JiraIssue_264
  • Loading branch information
hmmwhatsthisdo committed May 29, 2018
2 parents d6a3a01 + 9b13070 commit 9d516c8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ root = true
[*]
indent_style = space
indent_size = 4
end_of_line = lf
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
21 changes: 9 additions & 12 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@
CHANGELOG.md merge=union

# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
* text=auto eol=crlf

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.md text
*.gitattributes text

# Declare files that will always have LF line endings on checkout.
*.ps1 text eol=lf
*.psm1 text eol=lf
*.psd1 text eol=lf
*.psc1 text eol=lf
*.ps1xml text eol=lf
*.clixml text eol=lf
*.xml text eol=lf
*.txt text eol=lf
*.md text eol=lf
*.ps1 text
*.psm1 text
*.psd1 text
*.psc1 text
*.ps1xml text
*.clixml text
*.xml text
*.txt text

# Denote all files that are truly binary and should not be mergeable.
*.dll binary
Expand Down

0 comments on commit 9d516c8

Please sign in to comment.