# Conflicts: # lib/login/register/starLock_register_logic.dart # lib/login/register/starLock_register_page.dart # lib/login/register/starLock_register_state.dart # lib/main/lockDetail/face/faceDetail/faceDetail_logic.dart # lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart # lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart