Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
alihanozturk
2016-05-28 20:03:05 +03:00
parent 662da13141
commit 0003243edb
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/pisilinux/package-manager/pspec.xml
-4
View File
@@ -41,11 +41,7 @@
<History> <History>
<Update release="1"> <Update release="1">
<<<<<<< HEAD
<Date>2016-05-28</Date> <Date>2016-05-28</Date>
=======
<Date>2016-04-28</Date>
>>>>>>> 0cacccf24999358249ace629587d3b6c85b2b448
<Version>4.1.1</Version> <Version>4.1.1</Version>
<Comment>ported pyqt5</Comment> <Comment>ported pyqt5</Comment>
<Name>Ayhan Yalçınsoy</Name> <Name>Ayhan Yalçınsoy</Name>