diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
| commit | 56e942318f3c493c8dcd4759f806034331ebeda5 (patch) | |
| tree | 82cdca65cd197f36ea3680171186e0ddcf234266 /git/refs/remote.py | |
| parent | d46e3fe9cb0dea2617cd9231d29bf6919b0f1e91 (diff) | |
| parent | 68f8a43d1b643318732f30ee1cd75e1d315a4537 (diff) | |
| download | gitpython-56e942318f3c493c8dcd4759f806034331ebeda5.tar.gz | |
Merge branch 'py3' into 0.3
Conflicts:
git/refs/log.py
Diffstat (limited to 'git/refs/remote.py')
| -rw-r--r-- | git/refs/remote.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git/refs/remote.py b/git/refs/remote.py index e3827ad9..b692e6df 100644 --- a/git/refs/remote.py +++ b/git/refs/remote.py @@ -1,7 +1,8 @@ -from head import Head from git.util import join_path from gitdb.util import join +from .head import Head + import os |