From 531d321d83db28c94a03c7e8b3d411b43c012060 Mon Sep 17 00:00:00 2001 From: gord-fig Date: Fri, 30 Aug 2002 05:53:24 +0000 Subject: [PATCH] Resolve my silly conflict. --- lustre/utils/lconf | 1 - 1 file changed, 1 deletion(-) diff --git a/lustre/utils/lconf b/lustre/utils/lconf index f5fe9c3..702a37d 100755 --- a/lustre/utils/lconf +++ b/lustre/utils/lconf @@ -1387,4 +1387,3 @@ if __name__ == "__main__": print e except CommandError, e: e.dump() - -- 1.8.3.1