From c78f99b0b3b4b9ac99a69b63315e821d89a89a3b Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 20 Jul 2007 16:25:43 +0000
Subject: [PATCH] Result of svn merge -r65354:66054
 svn+ssh://svn/svn/linden/branches/ezrpc into release

---
 indra/test/test_llmanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py
index f4fc2820ebf..2c4662a83de 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
-- 
GitLab