Closed tzcoolman closed 11 years ago
@tzcoolman it seems that the changes you pullrequested cannot be merged cleanly, please make sure that you:
1) git pull upstream master 2) git pull master 3) git commit & push your changes
Thanks!
@brainstorm Now it seems okay.... Plz check it and merge it.
@tzcoolman it seems that the changes you pullrequested cannot be merged cleanly, please make sure that you:
Thanks!