Fix error caused by resolving merge conflict

2021-07-25 17:02:29 +02:00 · 2021-07-25 17:02:29 +02:00 · ffee6dc521
parent cca82a69bf
commit ffee6dc521
1 changed files with 3 additions and 2 deletions
--- a/blender/arm/handlers.py
+++ b/blender/arm/handlers.py
@ -10,6 +10,7 @@ import arm.api
 import arm.live_patch as live_patch
 import arm.logicnode.arm_nodes as arm_nodes
 import arm.nodes_logic
+import arm.make as make
 import arm.make_state as state
 import arm.props as props
 import arm.utils