aboutsummaryrefslogtreecommitdiffstats
path: root/zh_cn/uninstall-Mageia.html
diff options
context:
space:
mode:
Diffstat (limited to 'zh_cn/uninstall-Mageia.html')
-rw-r--r--zh_cn/uninstall-Mageia.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/zh_cn/uninstall-Mageia.html b/zh_cn/uninstall-Mageia.html
index 82ef051..4b716df 100644
--- a/zh_cn/uninstall-Mageia.html
+++ b/zh_cn/uninstall-Mageia.html
@@ -31,7 +31,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e1232"></a>&#22914;&#20309;&#20570;
+=======
<h3 class="title"><a name="d5e1262"></a>&#22914;&#20309;&#20570;
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>