Bump up to 0.2.4.

xorgxrdp.spec

@@ -1,11 +1,6 @@
 Name:           xorgxrdp
-<<<<<<< HEAD
 Version:        0.2.4
 Release:        1%{?dist}
-=======
-Version:        0.2.3
-Release:        3%{?dist}
->>>>>>> 63a67acac570b72a88870790c30dff399e6deb05
 Summary:        Implementation of xrdp backend as Xorg modules
 
 License:        MIT
@@ -56,16 +51,14 @@ for screen resizing and multiple monitors.
 
 
 %changelog
-<<<<<<< HEAD
 * wed Sep 20 2017 Bojan Smojver <bojan@rexursive.com> - 0.2.4-1
 - Bump up to 0.2.4
-=======
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
->>>>>>> 63a67acac570b72a88870790c30dff399e6deb05
 
 * Thu Jul 20 2017 Bojan Smojver <bojan@rexursive.com> - 0.2.3-1
 - Bump up to 0.2.3