From 35f79579758644cbcac6005f894be21f34f42b99 Mon Sep 17 00:00:00 2001
From: boxi <lewis.liulei@huawei.com>
Date: Thu, 22 Apr 2021 16:44:46 +0800
Subject: [PATCH] fix: Show conflicting files for git apply or patch -p command

Modify the .gitignore file to display the conflicting files of git apply or patch -px.

Close #I3NNUS

Change-Id: I0ca0e312d0a83326e661d997181167e61b63e4b4
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b15f208..fc87f6d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,6 @@
 *.a
 *.so
 *.swp
-*.rej
-*.orig
 
 # IDE settings
 .vscode