Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release
parent
168794a0f3
commit
c78f99b0b3
|
|
@ -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