fix botched merge

This commit is contained in:
Rex Dieter 2017-11-06 10:08:45 -06:00
parent 44ae06a0f8
commit 9c6d6cc34e
1 changed files with 0 additions and 5 deletions

5
.gitignore vendored
View File

@ -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