fix: merge error

2019-12-02 17:38:31 +01:00
parent d12fe9dd70
commit c56b52d069
1 changed files with 0 additions and 3 deletions
--- a/multi_user/operators.py
+++ b/multi_user/operators.py
@ -393,10 +393,7 @@ def register():
    for cls in classes:
        register_class(cls)

-<<<<<<< HEAD
-=======
    bpy.app.handlers.load_pre.append(load_pre_handler)
->>>>>>> master

 def unregister():
    global client