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

chore: .lock file conflicts #4097

Merged
merged 1 commit into from
Feb 15, 2020
Merged

chore: .lock file conflicts #4097

merged 1 commit into from
Feb 15, 2020

Conversation

kushthedude
Copy link
Member

TBD

@auto-label auto-label bot added the chore label Feb 15, 2020
@kushthedude
Copy link
Member Author

@iamareebjamal While running and upgrading dependencies this is the conflict I am getting with the development branch .

@iamareebjamal iamareebjamal marked this pull request as ready for review February 15, 2020 18:26
@kushthedude kushthedude merged commit 90ed04d into fossasia:development Feb 15, 2020
@codecov
Copy link

codecov bot commented Feb 15, 2020

Codecov Report

Merging #4097 into development will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           development    #4097   +/-   ##
============================================
  Coverage        21.88%   21.88%           
============================================
  Files              451      451           
  Lines             4729     4729           
============================================
  Hits              1035     1035           
  Misses            3694     3694           

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 4e66a53...52ad86f. Read the comment docs.

@kushthedude kushthedude deleted the yarn branch February 15, 2020 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants