Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release.
parent
a994cc3775
commit
88d7d45316
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue