diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-07-01 17:58:19 +0200 |
| commit | fd96cceded27d1372bdc1a851448d2d8613f60f3 (patch) | |
| tree | 5b53f288a3379e260f46a65d08691fceec4a0ca3 /lib/git/objects/base.py | |
| parent | 6917ae4ce9eaa0f5ea91592988c1ea830626ac3a (diff) | |
| parent | c3bd05b426a0e3dec8224244c3c9c0431d1ff130 (diff) | |
| download | gitpython-fd96cceded27d1372bdc1a851448d2d8613f60f3.tar.gz | |
Merge branch 'docs'
Diffstat (limited to 'lib/git/objects/base.py')
| -rw-r--r-- | lib/git/objects/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/git/objects/base.py b/lib/git/objects/base.py index 97b7898c..d4a46788 100644 --- a/lib/git/objects/base.py +++ b/lib/git/objects/base.py @@ -3,8 +3,8 @@ # # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php -from git.utils import LazyMixin, join_path_native, stream_copy -from utils import get_object_type_by_name +from git.util import LazyMixin, join_path_native, stream_copy +from util import get_object_type_by_name from gitdb.util import ( hex_to_bin, bin_to_hex, |