diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-14 03:47:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-14 03:47:06 -0400 |
| commit | 7117702fddf521ed4f3675a91cd87119207eba02 (patch) | |
| tree | 2fe4beeed78ae191c0f0330c71a7d9d7ba2d3099 | |
| parent | 50630840ee6802fef9db136505975db40a81920a (diff) | |
foo
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index b98b07d7d..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -.git-annex/*.log merge=union |