From 8e5025f354c4caf876fa8f824e5ed4344ebbc1a6 Mon Sep 17 00:00:00 2001
From: ge-yafang <geyafang@huawei.com>
Date: Wed, 6 Sep 2023 18:00:59 +0800
Subject: [PATCH] update docs

Signed-off-by: ge-yafang <geyafang@huawei.com>
---
 .../reference/apis/js-apis-data-relationalStore.md           | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/zh-cn/application-dev/reference/apis/js-apis-data-relationalStore.md b/zh-cn/application-dev/reference/apis/js-apis-data-relationalStore.md
index a7b59e58e7..d62d1421e0 100644
--- a/zh-cn/application-dev/reference/apis/js-apis-data-relationalStore.md
+++ b/zh-cn/application-dev/reference/apis/js-apis-data-relationalStore.md
@@ -593,13 +593,8 @@ class EntryAbility extends UIAbility {
 
 | 类型             | 说明                               |
 | ---------------- | ---------------------------------- |
-<<<<<<< HEAD
-| number | 主键的类型可以是number。 |
-|  string | 主键的类型可以是string。 |
-=======
 | number | 主键的类型可以是number |
 | string | 主键的类型可以是string。 |
->>>>>>> 47cb75c33d5460a146af0ead5e8946365240866f
 
 ## UTCTime<sup>10+</sup>
 
-- 
GitLab