From afaf40e8fbdb9f2e3a3ec267006f9c2f999a0ed9 Mon Sep 17 00:00:00 2001
From: "ithink.chan" <chenyang@autoai.com>
Date: Mon, 27 Apr 2020 13:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20conflicting=20files=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ithink.chan <chenyang@autoai.com>
---
 Software/Applications/Pacman/Pacman.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Software/Applications/Pacman/Pacman.md b/Software/Applications/Pacman/Pacman.md
index 995397c..53287e8 100644
--- a/Software/Applications/Pacman/Pacman.md
+++ b/Software/Applications/Pacman/Pacman.md
@@ -42,6 +42,8 @@ pacman -Syu
 
 ## 问题处理
 
+### conflicting files
+
 在升级或安装软件包时经常遇到如下错误：
 
 ```sh