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

fix: grammar typo #291

Merged
merged 2 commits into from
Mar 12, 2021
Merged

fix: grammar typo #291

merged 2 commits into from
Mar 12, 2021

Conversation

fredster33
Copy link
Contributor

Please answer these questions before submitting a pull request

  • Why submit this pull request?

  • Bugfix

  • New feature provided

  • Improve performance

  • Backport patches

  • Related issues


Bugfix

  • Description
    This is a grammar fix to the README.
  • How to fix?
    N/A

New feature or improvement

  • Describe the details and related test reports.
    N/A

Backport patches

  • Why need to backport?
    N/A
  • Source branch
    patch-2
  • Related commits and pull requests
    N/A
  • Target branch
    master

@gxthrj
Copy link
Contributor

gxthrj commented Mar 11, 2021

@fredster33 There are conflicting files

@fredster33
Copy link
Contributor Author

@fredster33 There are conflicting files

Hmm, it seems like somebody else edited the README after my change. How could this be resolved?

@tokers
Copy link
Contributor

tokers commented Mar 12, 2021

@fredster33 Don't worry, I have solved these conflicts.

@codecov-io
Copy link

Codecov Report

Merging #291 (01bdaf0) into master (c65802c) will increase coverage by 47.80%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           master      #291       +/-   ##
============================================
+ Coverage   52.19%   100.00%   +47.80%     
============================================
  Files          32         1       -31     
  Lines        2320         1     -2319     
============================================
- Hits         1211         1     -1210     
+ Misses        952         0      -952     
+ Partials      157         0      -157     
Impacted Files Coverage Δ
pkg/metrics/prometheus.go
pkg/api/router/router.go
pkg/apisix/cluster.go
pkg/log/logger.go
cmd/ingress/ingress.go
pkg/log/default_logger.go
pkg/apisix/service.go
pkg/log/options.go
pkg/kube/translation/apisix_upstream.go
pkg/kube/translation/apisix_route.go
... and 23 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c65802c...01bdaf0. Read the comment docs.

@tokers tokers changed the title Grammar fix fix: grammar typo Mar 12, 2021
@tokers tokers merged commit e2ddfad into apache:master Mar 12, 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.

4 participants