Conflicts Fix

Should fix the conflict
3 years ago · 7335dfcbd1
parent 835cc4c90b
commit 7335dfcbd1
1 changed files with 1 additions and 0 deletions
--- a/utils/id.py
+++ b/utils/id.py
@ -1,5 +1,6 @@
 import re

+# Conflict fixed
 from utils.console import print_substep