HomePhabricator

Fix incorrect merge conflict resolution from 68571b25294

Authored by jkorous on Dec 6 2018, 2:23 AM.

Description

Fix incorrect merge conflict resolution from 68571b25294

apple-llvm-split-commit: 102ed98869e8f99efba3a696679d9bab64341593
apple-llvm-split-dir: clang/

Details

Committed
jkorousDec 6 2018, 2:23 AM
Parents
rG39cf3e8e9737: Merge clang-tools-extra: [clangd] Update the test code
Branches
Unknown
Tags
Unknown