diff options
Diffstat (limited to 'zh_cn/uninstall-Mageia.html')
| -rw-r--r-- | zh_cn/uninstall-Mageia.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zh_cn/uninstall-Mageia.html b/zh_cn/uninstall-Mageia.html index 4b716df..df91667 100644 --- a/zh_cn/uninstall-Mageia.html +++ b/zh_cn/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD <h3 class="title"><a name="d5e1232"></a>如何做 -======= - <h3 class="title"><a name="d5e1262"></a>如何做 ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> |