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

ec-cube2/cli に依存しないよう修正 #548

Merged
merged 5 commits into from
May 13, 2022

Conversation

nanasess
Copy link
Contributor

@nanasess
Copy link
Contributor Author

Windows 環境でのエラーは #526 で対応済み

@codecov-commenter
Copy link

codecov-commenter commented Apr 12, 2022

Codecov Report

Merging #548 (b49666c) into master (0d606f8) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #548   +/-   ##
=======================================
  Coverage   54.63%   54.63%           
=======================================
  Files          76       76           
  Lines        9058     9058           
=======================================
  Hits         4949     4949           
  Misses       4109     4109           
Flag Coverage Δ
tests 54.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out 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 0d606f8...b49666c. Read the comment docs.

@chihiro-adachi chihiro-adachi added this to the 2.17.3 milestone Apr 20, 2022
@chihiro-adachi
Copy link
Contributor

@nanasess
composer.json/lockのコンフリクト解消おねがいできますでしょうか。

@nanasess
Copy link
Contributor Author

@chihiro-adachi 解消しました

@chihiro-adachi
Copy link
Contributor

@nanasess
すみません、大変お手数ですがコンフリクト解消お願いいたします。

@nanasess
Copy link
Contributor Author

@chihiro-adachi 解消しました

@chihiro-adachi chihiro-adachi merged commit 5c2609a into EC-CUBE:master May 13, 2022
@chihiro-adachi
Copy link
Contributor

@nanasess
ありがとうございます、マージしました

@nanasess nanasess deleted the independent-of-cli branch October 3, 2022 08:10
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