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

Fix some resources diff error #175

Merged
merged 3 commits into from Dec 21, 2018

Conversation

Projects
None yet
2 participants
@BennieMeng
Copy link
Collaborator

BennieMeng commented Dec 21, 2018

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 #

@BennieMeng BennieMeng requested a review from wilhelmguo Dec 21, 2018

wilhelmguo and others added some commits Dec 21, 2018

@wilhelmguo wilhelmguo changed the base branch from master to release/v1.2 Dec 21, 2018

@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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@wilhelmguo wilhelmguo added the kind/bug label Dec 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.