diff options
| author | Gerard Lynch <gerard@halberom.co.uk> | 2015-02-23 23:20:33 +0100 |
|---|---|---|
| committer | Gerard Lynch <gerard@halberom.co.uk> | 2015-02-23 23:20:33 +0100 |
| commit | 5b1d51c2bf016ff3a66cc4655c8e5c40af120dca (patch) | |
| tree | 9ad539b03bbe29e277d7633984f6d5a748f4bc63 /.gitattributes | |
| parent | Merge pull request #10316 from whereismyjetpack/winrm_https (diff) | |
| download | ansible-5b1d51c2bf016ff3a66cc4655c8e5c40af120dca.tar.xz ansible-5b1d51c2bf016ff3a66cc4655c8e5c40af120dca.zip | |
updated changelog with 1.8.2-4 content, added .gitattributes
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..a19ade077d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union |