fix botched merge
This commit is contained in:
parent
44ae06a0f8
commit
9c6d6cc34e
5
.gitignore
vendored
5
.gitignore
vendored
@ -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
|
/qtbase-opensource-src-5.9.2.tar.xz
|
||||||
>>>>>>> f27
|
|
||||||
|
Loading…
Reference in New Issue
Block a user