Skip to content
Snippets Groups Projects
Commit 5409c8f6 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

fix bug in merge 

(cherry picked from commit 0762f872)
parent 34eb3107
Branches
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment