From 9c6d6cc34ec7f3c96ae1c3355235b896f28b0257 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Mon, 6 Nov 2017 10:08:45 -0600
Subject: [PATCH] fix botched merge

---
 .gitignore | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 073cbb9..1db007e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/qtbase-opensource-src-5.9.1.tar.xz
-/0086-Fix-detection-of-AT-SPI.patch
-<<<<<<< HEAD
-=======
 /qtbase-opensource-src-5.9.2.tar.xz
->>>>>>> f27