Merge conflict#57

SandrineP wants to merge 2 commits intoQuantStack:mainQuantStack/git2cpp:mainfrom

SandrineP:merge_conflictSandrineP/git2cpp:merge_conflictCopy head branch name to clipboard