solve conflict

Signed-off-by: zhangpengcheng <zhangpengcheng31@huawei.com>
Change-Id: Ide5e3563e5a98a9fd648dc8deee34eea353a0336
This commit is contained in:
zhangpengcheng 2022-02-28 08:08:25 +00:00
parent 2a53c0b21f
commit feab8c06d5

View File

@ -59,4 +59,3 @@ private:
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_INTERACTION_BRIDGE_H