From 24f9e217f001c16622a79a8609733ecb7cd26755 Mon Sep 17 00:00:00 2001
From: RonnyDo <ronnydobra@arcor.de>
Date: Thu, 26 Apr 2018 22:37:53 -0500
Subject: [PATCH] fix version conflict part 2

---
 .../com.github.ronnydo.colorpicker.appdata.xml | 18 +++++++++++++++++-
 debian/changelog                               | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/data/com.github.ronnydo.colorpicker.appdata.xml b/data/com.github.ronnydo.colorpicker.appdata.xml
index 5582fa2..b161f24 100644
--- a/data/com.github.ronnydo.colorpicker.appdata.xml
+++ b/data/com.github.ronnydo.colorpicker.appdata.xml
@@ -22,7 +22,23 @@
 	<category>Development</category>
   </categories>
   <releases>
-	​<release version="1.0.3" date="2018-04-27" urgency="medium">
+  	​<release version="1.0.5" date="2018-04-27" urgency="medium">
+  	​  <description>
+  	    <ul>
+  		  <li>Implement 'close with right-mouse-button' feature (issue #27)</li>
+  		  <li>Update icon</li>
+  		  <li>Add French, Spanish and Catalan translation</li>
+  		</ul>
+  	  </description>
+  	​</release>
+	​<release version="1.0.4" date="2018-04-27" urgency="medium">
+	​  <description>
+	    <ul>
+		  <li>fix version conflict</li>
+		</ul>
+	  </description>
+	​</release>
+	​<release version="1.0.3" date="2018-04-26" urgency="medium">
 	​  <description>
 	    <ul>
 		  <li>Implement 'close with right-mouse-button' feature (issue #27)</li>
diff --git a/debian/changelog b/debian/changelog
index da3c824..97a7f62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,25 @@
-com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=low
+com.github.ronnydo.colorpicker (1.0.5) xenial; urgency=medium
 
   * Implement 'close with right-mouse-button' feature (issue #27)
   * Update icon
   * Add French, Spanish and Catalan translation
   
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 27 Apr 2017 18:31:00 +0100
+ 
+com.github.ronnydo.colorpicker (1.0.4) xenial; urgency=medium
+
+  * fix version conflicts
+  
  -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 27 Apr 2017 13:31:00 +0100
  
+com.github.ronnydo.colorpicker (1.0.3) xenial; urgency=medium
+
+  * Implement 'close with right-mouse-button' feature (issue #27)
+  * Update icon
+  * Add French, Spanish and Catalan translation
+  
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 26 Apr 2017 13:31:00 +0100
+ 
 com.github.ronnydo.colorpicker (1.0.2) xenial; urgency=medium
 
   * Implement "Don't add the same color to color history twice" (issue #24)