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

fix

Browse Source
This commit is contained in:
alihanozturk
2016-05-20 17:15:05 +03:00
parent 6ae9e72dfb
commit 59e6793904
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/python/python3-setuptools/pspec.xml
-4
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'> <!DOCTYPE PISI SYSTEM 'http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd'>
<PISI> <PISI>
@@ -29,7 +28,6 @@
</Package> </Package>
<History> <History>
<<<<<<< HEAD
<Update release="3"> <Update release="3">
<Date>2016-05-16</Date> <Date>2016-05-16</Date>
<Version>20.10.1</Version> <Version>20.10.1</Version>
@@ -44,8 +42,6 @@
<Name>Yusuf Aydemir</Name> <Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email> <Email>yusuf.aydemir@pisilinux.org</Email>
</Update> </Update>
=======
>>>>>>> parent of cc91b33... python3-setuptools version bump to 20.10.1
<Update release="1"> <Update release="1">
<Date>2016-04-28</Date> <Date>2016-04-28</Date>
<Version>19.6.1</Version> <Version>19.6.1</Version>