try to resolve conflicts
This commit is contained in:
parent
414dd8bb47
commit
a53d85a75a
@ -760,5 +760,5 @@ def main():
|
||||
finally:
|
||||
shutdown()
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user