diff options
author | 2015-05-12 13:23:22 -0400 | |
---|---|---|
committer | 2015-05-12 13:23:22 -0400 | |
commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Git/Remote/Remove.hs | |
parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Git/Remote/Remove.hs')
-rw-r--r-- | Git/Remote/Remove.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/Remote/Remove.hs b/Git/Remote/Remove.hs index 2ffc9b358..e6c13b9ea 100644 --- a/Git/Remote/Remove.hs +++ b/Git/Remote/Remove.hs @@ -1,4 +1,4 @@ -{- git remote stuff +{- git remote removal - - Copyright 2012 Joey Hess <id@joeyh.name> - |