This repository was archived by the owner on Mar 4, 2025. It is now read-only.
fixed #694 added tco16 url #697
Merged
Conversation
This file contains hidden or 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
|
@nlitwin please review and merge today. |
|
@shubhendusaurabh could you resolve the merge conflicts and submit a new PR? |
|
Sorry about this one. I didn't see the comment to look at this one today. I will do it first thing in the morning, and I can fix the merge conflicts too. |
|
@huangqun @shubhendusaurabh @nlitwin I am working on resolving the conflicts. I would update once I am done. |
|
I have resolved the conflicts, however, I am not able to push changed into the target branch. Its throwing 403 to me. |
|
Created new PR with resolved conflicts. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixed #694 added tco 2016 nav url