From 1e94ef3226c32ae8868ffaa9c3b3aa96293cbaa9 Mon Sep 17 00:00:00 2001
From: MDN <actions@users.noreply.github.com>
Date: Fri, 20 Aug 2021 00:45:20 +0000
Subject: [CRON] sync translated content

---
 files/zh-cn/_redirects.txt                 |  3 ++-
 files/zh-cn/_wikihistory.json              | 14 +++-----------
 files/zh-cn/conflicting/web/api/index.html |  7 +++++++
 files/zh-cn/web/api/index/index.html       |  7 -------
 4 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 files/zh-cn/conflicting/web/api/index.html
 delete mode 100644 files/zh-cn/web/api/index/index.html

(limited to 'files/zh-cn')

diff --git a/files/zh-cn/_redirects.txt b/files/zh-cn/_redirects.txt
index 83915af3b0..566a22782a 100644
--- a/files/zh-cn/_redirects.txt
+++ b/files/zh-cn/_redirects.txt
@@ -1377,6 +1377,7 @@
 /zh-CN/docs/Web/API/IDBCursor.direction	/zh-CN/docs/Web/API/IDBCursor/direction
 /zh-CN/docs/Web/API/IDBFactory.open	/zh-CN/docs/Web/API/IDBFactory/open
 /zh-CN/docs/Web/API/IDBObjectStore.openCursor	/zh-CN/docs/Web/API/IDBObjectStore/openCursor
+/zh-CN/docs/Web/API/Index	/zh-CN/docs/conflicting/Web/API
 /zh-CN/docs/Web/API/IndexedDB_API/IDBObjectStore	/zh-CN/docs/Web/API/IDBObjectStore
 /zh-CN/docs/Web/API/Intersection_Observer_API/点观察者API的时序元素可见性	/zh-CN/docs/Web/API/Intersection_Observer_API/Timing_element_visibility
 /zh-CN/docs/Web/API/Location.replace	/zh-CN/docs/Web/API/Location/replace
@@ -1641,7 +1642,7 @@
 /zh-CN/docs/Web/API/window.requestAnimationFrame	/zh-CN/docs/Web/API/Window/requestAnimationFrame
 /zh-CN/docs/Web/API/剪贴板_API	/zh-CN/docs/Web/API/Clipboard_API
 /zh-CN/docs/Web/API/开发式平台	/zh-CN/docs/Web/API/Push_API
-/zh-CN/docs/Web/API/指数	/zh-CN/docs/Web/API/Index
+/zh-CN/docs/Web/API/指数	/zh-CN/docs/conflicting/Web/API
 /zh-CN/docs/Web/API/支付_请求_接口	/zh-CN/docs/Web/API/Payment_Request_API
 /zh-CN/docs/Web/API/支付_请求_接口/Concepts	/zh-CN/docs/Web/API/Payment_Request_API/Concepts
 /zh-CN/docs/Web/API/消息事件	/zh-CN/docs/Web/API/MessageEvent
diff --git a/files/zh-cn/_wikihistory.json b/files/zh-cn/_wikihistory.json
index 091b99d93b..c7337931f9 100644
--- a/files/zh-cn/_wikihistory.json
+++ b/files/zh-cn/_wikihistory.json
@@ -16296,13 +16296,6 @@
       "ice-i-snow"
     ]
   },
-  "Web/API/Index": {
-    "modified": "2020-09-07T03:42:22.980Z",
-    "contributors": [
-      "SphinxKnight",
-      "hl7514576"
-    ]
-  },
   "Web/API/IndexedDB_API": {
     "modified": "2020-08-17T03:58:13.141Z",
     "contributors": [
@@ -47010,11 +47003,10 @@
     ]
   },
   "conflicting/Web/API": {
-    "modified": "2019-03-23T23:09:29.332Z",
+    "modified": "2020-09-07T03:42:22.980Z",
     "contributors": [
-      "mySoul",
-      "teoli",
-      "AlexChao"
+      "SphinxKnight",
+      "hl7514576"
     ]
   },
   "conflicting/Web/API/Beacon_API": {
diff --git a/files/zh-cn/conflicting/web/api/index.html b/files/zh-cn/conflicting/web/api/index.html
new file mode 100644
index 0000000000..70b70e7ec2
--- /dev/null
+++ b/files/zh-cn/conflicting/web/api/index.html
@@ -0,0 +1,7 @@
+---
+title: 指数
+slug: conflicting/Web/API
+translation_of: Web/API/Index
+original_slug: Web/API/Index
+---
+<p>{{Index("/zh-CN/docs/Web/API")}}</p>
diff --git a/files/zh-cn/web/api/index/index.html b/files/zh-cn/web/api/index/index.html
deleted file mode 100644
index e910b907d2..0000000000
--- a/files/zh-cn/web/api/index/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: 指数
-slug: Web/API/Index
-translation_of: Web/API/Index
-original_slug: Web/API/指数
----
-<p>{{Index("/zh-CN/docs/Web/API")}}</p>
-- 
cgit v1.2.3-54-g00ecf