From 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Wed, 11 Jul 2007 21:29:02 +0000
Subject: svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088
 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired
 by Tess and rdw.

---
 indra/lib/python/indra/__init__.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'indra/lib/python')

diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py
index 8f5987696c..7db53666e8 100644
--- a/indra/lib/python/indra/__init__.py
+++ b/indra/lib/python/indra/__init__.py
@@ -1,6 +1,5 @@
-"""@file __init__.py
-@brief 
-
-Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
-$License$
-"""
+# @file __init__.py
+# @brief Initialization file for the indra module.
+# 
+# Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
+# $License$
-- 
cgit v1.2.3