opps

2016-05-28 20:01:43 +03:00
parent 1caf1d95a7 0cacccf249
commit 90353caebc
5 changed files with 9 additions and 5 deletions
@@ -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>