fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit fe7d8da345cdba21bf9668c197714e612b8fdefd 1 parent 6c05c641

code review by hf: fixes some bugs

Inline Side-by-side
Showing 1 changed file with 0 additions and 6 deletions
@@ -20,13 +20,7 @@ require('./back/email'); @@ -20,13 +20,7 @@ require('./back/email');
20 require('./back/email-success'); 20 require('./back/email-success');
21 require('./back/new-password'); 21 require('./back/new-password');
22 22
23 -<<<<<<< HEAD  
24 //绑定手机 23 //绑定手机
25 require('./bind/bind'); 24 require('./bind/bind');
26 require('./bind/code'); 25 require('./bind/code');
27 require('./bind/password'); 26 require('./bind/password');
28 -  
29 -=======  
30 -// 绑定手机号  
31 -require('./bind/bind');  
32 ->>>>>>> aaefe4b5074e522f16bdd6940a6387d6254a18f2