Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge error

Browse Source
This commit is contained in:
Swann Martinez
2019-12-02 17:38:31 +01:00
parent d12fe9dd70
commit c56b52d069
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
multi_user/operators.py
View File

@ -393,10 +393,7 @@ def register():
for cls in classes: for cls in classes:
register_class(cls) register_class(cls)
<<<<<<< HEAD
=======
bpy.app.handlers.load_pre.append(load_pre_handler) bpy.app.handlers.load_pre.append(load_pre_handler)
>>>>>>> master
def unregister(): def unregister():
global client global client