diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-16 20:16:05 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-16 20:16:05 +0000 |
| commit | 88d7d45316186af931285b7f03d2a78cd04f888f (patch) | |
| tree | 3a8c9ad06b79ac354625812ecf3b97be01d1e701 /indra/test | |
| parent | a994cc3775dc41194bf66f5cac5795f73851f427 (diff) | |
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release.
Diffstat (limited to 'indra/test')
| -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 f4fc2820eb..2c4662a83d 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 import llmanifest +from indra.util import llmanifest import os.path import os import unittest |