Resolve my silly conflict.

author gord-fig <gord-fig>

Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)

committer gord-fig <gord-fig>

Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)
author gord-fig <gord-fig>
Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)
committer gord-fig <gord-fig>
Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)
diff --git a/lustre/utils/lconf b/lustre/utils/lconf

index f5fe9c3..702a37d 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -1387,4 +1387,3 @@ if __name__ == "__main__":
          print e
      except CommandError, e:
          e.dump()
-
author	gord-fig <gord-fig>
	Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)
committer	gord-fig <gord-fig>
	Fri, 30 Aug 2002 05:53:24 +0000 (05:53 +0000)