diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-14 13:38:35 -0400 |
| commit | 190656ed99241af034e1a105eefcd5a72214fe2f (patch) | |
| tree | 30310a17114b9d64b7c51a73b3af3a9cc171a56e /Git | |
| parent | 65c7bfcc55ec2243e1f4dcb5bbca54dce494bc63 (diff) | |
| parent | 36969d80d4c921dea8f3b48465dd9a533f97ecae (diff) | |
Merge branch 'master' into remotecontrol
Conflicts:
doc/devblog/day_152__more_ssh_connection_caching.mdwn
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Types.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Git/Types.hs b/Git/Types.hs index 950fe4b00..838c9e0e7 100644 --- a/Git/Types.hs +++ b/Git/Types.hs @@ -11,6 +11,7 @@ import Network.URI import qualified Data.Map as M import System.Posix.Types import Utility.SafeCommand +import Utility.URI () {- Support repositories on local disk, and repositories accessed via an URL. - |