Skip to content

Fix some resources diff error#175

Merged
wilhelmguo merged 3 commits intoQihoo360:release/v1.2from
BennieMeng:template-diff
Dec 21, 2018
Merged

Fix some resources diff error#175
wilhelmguo merged 3 commits intoQihoo360:release/v1.2from
BennieMeng:template-diff

Conversation

@BennieMeng
Copy link
Copy Markdown
Collaborator

What type of PR is this?

Uncomment only one, leave it on its own line:

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@wilhelmguo wilhelmguo changed the base branch from master to release/v1.2 December 21, 2018 11:07
@wilhelmguo wilhelmguo changed the title diffTpl replace Fix some resources diff error Dec 21, 2018
@wilhelmguo wilhelmguo merged commit 2cbf22d into Qihoo360:release/v1.2 Dec 21, 2018
@wilhelmguo wilhelmguo added the kind/bug Categorizes issue or PR as related to a bug. label Dec 21, 2018
@BennieMeng BennieMeng deleted the template-diff branch August 28, 2019 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug Categorizes issue or PR as related to a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants