Skip to content
Snippets Groups Projects
Commit c78f99b0 authored by Aaron Brashears's avatar Aaron Brashears
Browse files

Result of svn merge -r65354:66054 svn+ssh://svn/svn/linden/branches/ezrpc into release

parent 168794a0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/test/test_llmanifest.py
+ 1
− 1
View file @ c78f99b0
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. # Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
# $License$ # $License$
from indra import llmanifest from indra.util import llmanifest
import os.path import os.path
import os import os
import unittest import unittest
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment