before amend
q
Merge branch 'bran_1' of github.com:jiekliao1314/blog into bran_1