diff options
| author | colings <colings@example.com> | 2011-02-13 10:46:43 -0600 |
|---|---|---|
| committer | colings <colings@example.com> | 2011-02-13 10:46:43 -0600 |
| commit | d759d47ef99ebde158620f43ab46a83f445d9e53 (patch) | |
| tree | 4b4f9a53d721ac02e8762d9c543ad479faa97bae /.gitattributes | |
| parent | 02a349f68ac480d5b1a630e14b4f2e3558328673 (diff) | |
| parent | d2c77fd0590501f7b6b51d9f4cc033ed9485b082 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..fdf9d072 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +.build_number merge=merge-keep-ours + |