Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
July 31, 2023 11:20
This reverts commit f4b502a. # Conflicts: # Cargo.lock # Cargo.toml # crates/voicevox_core/Cargo.toml # crates/voicevox_core_c_api/Cargo.toml # crates/voicevox_core_c_api/include/voicevox_core.h # crates/voicevox_core_c_api/src/lib.rs
qryxip
approved these changes
Jul 31, 2023
There was a problem hiding this comment.
2点ほどありますが、あとは私が巻き取る形でも大丈夫です! ひとまずapproveを出しておきます。
(この辺は#549 (comment)にちゃんと書いておくべきでした。すみません)
qryxip
reviewed
Jul 31, 2023
added 2 commits
August 1, 2023 23:32
qryxip
added a commit
to qryxip/voicevox_core
that referenced
this pull request
Aug 1, 2023
Co-authored-by: Ryo Yamashita <[email protected]>
qryxip
reviewed
Aug 3, 2023
added 3 commits
August 10, 2023 21:43
|
|
|
voicevox_core.h以外のもののConflictを解消した後generate-c-headerしてaddすればいけると思います。 |
added 2 commits
August 10, 2023 23:29
# Conflicts: # crates/voicevox_core/src/voice_synthesizer.rs # crates/voicevox_core_c_api/include/voicevox_core.h # crates/voicevox_core_c_api/src/lib.rs
sevenc-nanashi
approved these changes
Aug 12, 2023
|
おっと コンフリクトが発生していそうです 🙇 |
added 2 commits
August 13, 2023 10:55
# Conflicts: # crates/voicevox_core_c_api/tests/e2e/symbols.rs # crates/voicevox_core_c_api/tests/e2e/testcases/tts_via_audio_query.rs
qryxip
approved these changes
Aug 13, 2023
|
ありがとうございます! マージします。 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
内容
#503 をRevertします。
Tortoise Git を使用してRevertしました。競合が発生しましたが、元の変更等と比較しながら編集し、ビルドができるようにしました。不完全なところもあるかと思いますので、確認をお願いします。
関連 Issue
close #549
その他
自動生成された、競合についてのコメントを記載します。