davidlt/fedora-comps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up some rebasing debris

Browse Source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2019-12-14 16:18:12 -08:00
parent 14385e2b41
commit 083cf38c0e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
comps-f32.xml.in
View File

@ -937,12 +937,9 @@
<packagereq type="default">open-sans-fonts</packagereq> <packagereq type="default">open-sans-fonts</packagereq>
<packagereq type="default">optipng</packagereq> <packagereq type="default">optipng</packagereq>
<packagereq type="default">overpass-fonts</packagereq> <packagereq type="default">overpass-fonts</packagereq>
<<<<<<< HEAD
<packagereq type="default">pdfshuffler</packagereq> <packagereq type="default">pdfshuffler</packagereq>
=======
<packagereq type="default">pdfarranger</packagereq> <packagereq type="default">pdfarranger</packagereq>
<packagereq type="default">pdfmod</packagereq> <packagereq type="default">pdfmod</packagereq>
>>>>>>> upstream/master
<packagereq type="default">phatch</packagereq> <packagereq type="default">phatch</packagereq>
<packagereq type="default">pitivi</packagereq> <packagereq type="default">pitivi</packagereq>
<packagereq type="default">redhat-display-fonts</packagereq> <packagereq type="default">redhat-display-fonts</packagereq>