================ @@ -0,0 +1,95 @@ +//===--- MoveSmartPointerContentsCheck.cpp - clang-tidy -------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include <string> + +<<<<<<< HEAD +#include "MoveSmartPointerContentsCheck.h" +#include "../utils/Matchers.h" +#include "../utils/OptionsUtils.h" +======= +#include "../utils/Matchers.h" +#include "../utils/OptionsUtils.h" +#include "MoveSmartPointerContentsCheck.h" +>>>>>>> b0179a7f3cac ([clang-tidy] Add performance-move-smart-pointer-contents check.) ---------------- martinboehme wrote:
It looks as if you've got remnants of a merge conflict here? https://github.com/llvm/llvm-project/pull/66139 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
