From 0003243edb82363fd59d7b0ccb36b6813d84c2d0 Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sat, 28 May 2016 20:03:05 +0300
Subject: [PATCH] fix conflicts

---
 desktop/pisilinux/package-manager/pspec.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/desktop/pisilinux/package-manager/pspec.xml b/desktop/pisilinux/package-manager/pspec.xml
index 11fc078607..ba86628a22 100644
--- a/desktop/pisilinux/package-manager/pspec.xml
+++ b/desktop/pisilinux/package-manager/pspec.xml
@@ -41,11 +41,7 @@
 
     <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>