diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-20 16:25:43 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-07-20 16:25:43 +0000 |
| commit | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (patch) | |
| tree | dbbd74ea34943d87117eb50693623608e2c0c6cd | |
| parent | 168794a0f348bb4d1e29a091bcbd39a220918054 (diff) | |
Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release
| -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 |