Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swifty modify 16/7/2015 #3

Closed
wants to merge 1 commit into from
Closed

Conversation

wsk900906
Copy link

add hour, second, minute change listener.
add two models: Timer & StopWatch.
add set default time API: setStartTime(final int h, final int m, final
int s);

add hour, second, minute change listener.
add two models: Timer & StopWatch.
add set default time API:  setStartTime(final int h, final int m, final
int s);
@dujigui
Copy link
Owner

dujigui commented Jul 17, 2015

merge done.
提示有冲突(conflicts),我在客户端处理了冲突然后merge
但是为什么这里的pull request还在?

@wsk900906
Copy link
Author

母鸡。。。是不是还有conflicts? 我不小心把一些没用的东西也commit了。

@dujigui dujigui closed this Jul 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants