diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-16 20:29:28 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-16 20:29:28 +0000 |
| commit | 7964c6f7a5b622d698f7d471690b29122966b1b2 (patch) | |
| tree | 78a708bc316db2e2ff3047089a3edf8020c4d7cb /indra/test/test_llmanifest.py | |
| parent | 88d7d45316186af931285b7f03d2a78cd04f888f (diff) | |
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release. Also includes untabification of many python files.
Diffstat (limited to 'indra/test/test_llmanifest.py')
| -rw-r--r-- | indra/test/test_llmanifest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py index 2c4662a83d..f4fc2820eb 100644 --- a/indra/test/test_llmanifest.py +++ b/indra/test/test_llmanifest.py @@ -6,7 +6,7 @@ # Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. # $License$ -from indra.util import llmanifest +from indra import llmanifest import os.path import os import unittest |