opps

desktop/pisilinux/package-manager/pspec.xml

@@ -41,7 +41,11 @@
 
     <History>
         <Update release="1">
+<<<<<<< HEAD
             <Date>2016-05-28</Date>
+=======
+            <Date>2016-04-28</Date>
+>>>>>>> 0cacccf24999358249ace629587d3b6c85b2b448
             <Version>4.1.1</Version>
             <Comment>ported pyqt5</Comment>
             <Name>Ayhan Yalçınsoy</Name>

desktop/pisilinux/pisilinux-desktop-services/pspec.xml

@@ -35,7 +35,7 @@
 
     <History>
         <Update release="1">
-            <Date>2016-04-15</Date>
+            <Date>2016-04-28</Date>
             <Version>2.0.0</Version>
             <Comment>Version bump.</Comment>
             <Name>Ayhan Yalçınsoy</Name>

desktop/toolkit/qscintilla2/pspec.xml

@@ -111,7 +111,7 @@
 
     <History>
         <Update release="1">
-            <Date>2016-05-08</Date>
+            <Date>2016-05-28</Date>
             <Version>2.9.1</Version>
             <Comment>First release</Comment>
             <Name>Ayhan Yalçınsoy</Name>

multimedia/video/gst-plugins-good-next/pspec.xml

@@ -29,7 +29,7 @@
             <!--<Dependency>libshout-devel</Dependency>-->
             <!--<Dependency>wavpack-devel</Dependency>-->
             <!--<Dependency>libcaca-devel</Dependency>-->
-            <Dependency>libsoup-devel</Dependency>
+            <Dependency>libsoup-devel</Dependency>z
             <!--<Dependency>libsoup-gnome</Dependency>-->
             <Dependency>libXext-devel</Dependency>
             <Dependency>libv4l-devel</Dependency>

programming/language/python/pyqtermwidget5/pspec.xml

@@ -39,7 +39,7 @@
     </Package>
     <History>
         <Update release="2">
-            <Date>2016-05-23</Date>
+            <Date>2016-05-28</Date>
             <Version>0.1</Version>
             <Comment>Rebuild</Comment>
             <Name>Harun Gültekin</Name>