这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@vahid-sohrabloo
Copy link
Contributor

No description provided.

@gytdau
Copy link
Collaborator

gytdau commented Mar 29, 2016

Sorry, but it appears due to the magnitude of requests, the file you've modified has changed and it cannot be automatically merged. If you'd like, you can rebase against master, or if you're not bothered, you could close the commit (no hard feelings).

@gytdau gytdau added the rebase label Mar 29, 2016
@konkked konkked merged commit 648879a into jezen:master Mar 30, 2016
This was referenced Mar 30, 2016
@gytdau gytdau removed the rebase label Mar 30, 2016
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.

3 participants