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

Merge pull request #1 from v2ray/master #182

Closed
wants to merge 1 commit into from

Conversation

leaves615
Copy link

merge from v2ray

@codecov-io
Copy link

Current coverage is 73.55%

Merging #182 into master will decrease coverage by 0.04%

@@             master       #182   diff @@
==========================================
  Files           145        145          
  Lines         13312      13312          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
- Hits           9797       9791     -6   
- Misses         3269       3274     +5   
- Partials        246        247     +1   

Powered by Codecov. Last updated by d12d5b0...717f7e8

@v2ray
Copy link
Collaborator

v2ray commented Jun 26, 2016

What is this? I can't see any changes.

@xiaokangwang
Copy link
Contributor

xiaokangwang commented Jun 27, 2016

这个PR是误操作吧, 可能是以前fork了你的repo,后来用github的PR把比较新的你的代码pull到了他自己的代码库之后,把这个merge的commit的PR到你这里了。

@v2ray
Copy link
Collaborator

v2ray commented Jun 29, 2016

Closing as the author doesn't provide reasonable clarification for this PR.

@v2ray v2ray closed this Jun 29, 2016
@leaves615
Copy link
Author

sorry 我只是想pull

xiocode pushed a commit to going/v2ray-core that referenced this pull request Mar 4, 2021
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

4 participants