From c56b52d069fff5fba50a9fec1f7f3b32a2eafe46 Mon Sep 17 00:00:00 2001
From: Swann Martinez <s.martinez@cubedns.fr>
Date: Mon, 2 Dec 2019 17:38:31 +0100
Subject: [PATCH] fix: merge error

---
 multi_user/operators.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/multi_user/operators.py b/multi_user/operators.py
index e86e1a9..2e25f69 100644
--- 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