Skip to content

Conversation

@zhaocai
Copy link
Contributor

@zhaocai zhaocai commented May 7, 2013

No description provided.

.gitignore Outdated
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not ignore *.orig files, since I consider them post-merge leftovers that should be deleted, and seeing them in the output of git status helps me notice them. Could you revert this change?

@zhaocai
Copy link
Contributor Author

zhaocai commented May 9, 2013

@AndrewRadev removed

AndrewRadev added a commit that referenced this pull request May 10, 2013
Add client.foreground to Bring the server to foreground
@AndrewRadev AndrewRadev merged commit 6f2d96a into AndrewRadev:master May 10, 2013
@AndrewRadev
Copy link
Owner

Merged, thanks for your work.

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.

2 participants