李志伟 3 years ago
parent
commit
8c6a8a9232
1 changed files with 0 additions and 4 deletions
  1. 0
    4
      src/utils/hooks/useRouter.js

+ 0
- 4
src/utils/hooks/useRouter.js View File

41
       }
41
       }
42
     }
42
     }
43
   }, [qrCode, scene])
43
   }, [qrCode, scene])
44
-<<<<<<< HEAD
45
-=======
46
-
47
->>>>>>> b871529541525c34775f5c58a561d7153f4f99f7
48
   return routerRef.current
44
   return routerRef.current
49
 }
45
 }