From: gord-fig Date: Fri, 30 Aug 2002 05:53:24 +0000 (+0000) Subject: Resolve my silly conflict. X-Git-Tag: 0.5.5~4 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=531d321d83db28c94a03c7e8b3d411b43c012060;p=fs%2Flustre-release.git Resolve my silly conflict. --- 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() -