rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

remove errant MERGING fragment

Browse Source
This commit is contained in:
Rex Dieter 2015-08-06 10:34:23 -05:00
parent 4043165545
commit 46b52f8ba0
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qt5-qtbase.spec
View File

@ -928,7 +928,6 @@ fi
%changelog %changelog
<<<<<<< HEAD
* Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13 * Thu Aug 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-13
- use upstream commit/fix for QTBUG-46310 - use upstream commit/fix for QTBUG-46310
- restore qdoc/gdb hackery, i686 still needs it :( - restore qdoc/gdb hackery, i686 still needs it :(